[mythtv-firehose] mythtv/mythtv-rec2 commit: 574624006 by Daniel Kristjansson (daniel-kristjansson)

MythTV noreply at mythtv.org
Mon May 16 19:34:59 UTC 2011


      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-05-16T11:54:25-07:00
   Push Date:  2011/05/16 12:34:53 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  574624006a000de3b4f3b55983cdbc8249d4cc52
   Changeset:  https://github.com/MythTV/mythtv/commit/574624006

Log:

Merge commit '8bf515' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
	mythtv/libs/libmythupnp/multicast.cpp
	mythtv/libs/libmythupnp/upnptasknotify.cpp

Modified:

   mythtv/bindings/php/MythBackend.php
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmythbase/msocketdevice.cpp
   mythtv/libs/libmythbase/msocketdevice.h
   mythtv/libs/libmythbase/msocketdevice_unix.cpp
   mythtv/libs/libmythbase/msocketdevice_win.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/storagegroup.cpp
   mythtv/libs/libmythmetadata/metadataimagedownload.cpp
   mythtv/libs/libmythmetadata/videoutils.h
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythui/mythudplistener.cpp
   mythtv/libs/libmythui/mythuifilebrowser.cpp
   mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
   mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/libs/libmythupnp/upnpdevice.cpp
   mythtv/libs/libmythupnp/upnptasknotify.cpp
   mythtv/libs/libmythupnp/upnptasksearch.cpp
   mythtv/programs/mythbackend/httpconfig.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/mediarenderer.cpp
   mythtv/programs/mythfrontend/networkcontrol.h
   mythtv/programs/mythfrontend/playbackboxhelper.cpp
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/programs/mythlcdserver/lcdserver.cpp
   mythtv/programs/mythtranscode/main.cpp



More information about the mythtv-firehose mailing list