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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-11T06:55:41-07:00
   Push Date:  2012/04/10 00:41:52 -0700
  Repository:  mythtv
      Branch:  devel/mythtv-rec2
New Revision:  999ead10bab2cde472dc9a8f6455f3740ef0728a
   Changeset:  https://github.com/MythTV/mythtv/commit/999ead10b

Log:

Merge branch 'master' into mythtv-rec2

Modified:

   mythtv/libs/libmythservicecontracts/datacontracts/videoMultiplex.h
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythui/mythscreentype.cpp
   mythtv/programs/mythbackend/services/channel.cpp
   mythtv/programs/mythmetadatalookup/lookup.cpp
   mythtv/programs/mythmetadatalookup/lookup.h
   mythtv/programs/mythmetadatalookup/main.cpp