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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-30T15:18:56-07:00
   Push Date:  2011/07/30 15:19:21 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  17229be763cd49f8394c4479b682be84bd3408ac
   Changeset:  https://github.com/MythTV/mythtv/commit/17229be76

Log:

Merge branch 'master' into mythtv-rec2

Modified:

   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythtv/mpegrecorder.cpp
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tvbrowsehelper.cpp
   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/playbackboxhelper.cpp
   mythtv/programs/mythmetadatalookup/lookup.cpp