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

MythTV noreply at mythtv.org
Mon Jun 27 21:29:50 UTC 2011


      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-06-27T14:01:50-07:00
   Push Date:  2011/06/27 14:29:39 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  22cf71ea88c6584c0d9435b700ffc6331327932c
   Changeset:  https://github.com/MythTV/mythtv/commit/22cf71ea8

Log:

Merge commit '957f2ef8c' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
	mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
	mythtv/libs/libmythupnp/mmulticastsocketdevice.h
	mythtv/libs/libmythupnp/mythxmlclient.cpp
	mythtv/libs/libmythupnp/soapclient.cpp
	mythtv/libs/libmythupnp/soapclient.h
	mythtv/libs/libmythupnp/ssdp.cpp
	mythtv/libs/libmythupnp/ssdpcache.cpp

Modified:

   mythtv/libs/libmythbase/msocketdevice.h
   mythtv/libs/libmythupnp/mbroadcastsocketdevice.h
   mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
   mythtv/libs/libmythupnp/mmulticastsocketdevice.h
   mythtv/libs/libmythupnp/soapclient.cpp
   mythtv/libs/libmythupnp/soapclient.h
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/libs/libmythupnp/upnptasknotify.cpp



More information about the mythtv-firehose mailing list