[mythtv-firehose] mythtv/utc commit: c13b1daed by Daniel Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-02-27T13:41:43-08:00
   Push Date:  2012/02/27 13:58:31 -0800
  Repository:  mythtv
      Branch:  utc
New Revision:  c13b1daedc343f4245571a3e4d3d85275983e220
   Changeset:  https://github.com/MythTV/mythtv/commit/c13b1daed

Log:

Merge branch 'master' into utc

Conflicts:
	mythtv/libs/libmythbase/mythcommandlineparser.cpp
	mythtv/libs/libmythtv/recordingrule.cpp
	mythtv/libs/libmythui/mythdialogbox.cpp

Modified:

   mythplugins/mytharchive/i18n/mytharchive_et.qm
   mythplugins/mytharchive/i18n/mytharchive_et.ts
   mythplugins/mytharchive/i18n/mytharchive_ru.qm
   mythplugins/mytharchive/i18n/mytharchive_ru.ts
   mythplugins/mytharchive/mytharchive/archiveutil.cpp
   mythplugins/mytharchive/mytharchive/importnative.cpp
   mythplugins/mytharchive/mytharchive/mythburn.cpp
   mythplugins/mythbrowser/i18n/mythbrowser_et.qm
   mythplugins/mythbrowser/i18n/mythbrowser_et.ts
   mythplugins/mythbrowser/i18n/mythbrowser_ru.qm
   mythplugins/mythbrowser/i18n/mythbrowser_ru.ts
   mythplugins/mythgallery/i18n/mythgallery_et.qm
   mythplugins/mythgallery/i18n/mythgallery_et.ts
   mythplugins/mythgallery/i18n/mythgallery_ru.qm
   mythplugins/mythgallery/i18n/mythgallery_ru.ts
   mythplugins/mythgame/i18n/mythgame_et.qm
   mythplugins/mythgame/i18n/mythgame_et.ts
   mythplugins/mythgame/i18n/mythgame_ru.qm
   mythplugins/mythgame/i18n/mythgame_ru.ts
   mythplugins/mythmusic/i18n/mythmusic_et.qm
   mythplugins/mythmusic/i18n/mythmusic_et.ts
   mythplugins/mythmusic/i18n/mythmusic_ru.qm
   mythplugins/mythmusic/i18n/mythmusic_ru.ts
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythnetvision/i18n/mythnetvision_et.qm
   mythplugins/mythnetvision/i18n/mythnetvision_et.ts
   mythplugins/mythnews/i18n/mythnews_et.qm
   mythplugins/mythnews/i18n/mythnews_et.ts
   mythplugins/mythnews/i18n/mythnews_ru.qm
   mythplugins/mythnews/i18n/mythnews_ru.ts
   mythplugins/mythweather/i18n/mythweather_et.qm
   mythplugins/mythweather/i18n/mythweather_et.ts
   mythplugins/mythweather/i18n/mythweather_ru.qm
   mythplugins/mythweather/i18n/mythweather_ru.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_et.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_et.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_ru.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_ru.ts
   mythtv/configure
   mythtv/i18n/mythfrontend_en_gb.qm
   mythtv/i18n/mythfrontend_en_gb.ts
   mythtv/i18n/mythfrontend_et.qm
   mythtv/i18n/mythfrontend_et.ts
   mythtv/i18n/mythfrontend_ru.qm
   mythtv/i18n/mythfrontend_ru.ts
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmyth/programtypes.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.h
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythsystem.cpp
   mythtv/libs/libmythbase/mythsystem.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/system-unix.cpp
   mythtv/libs/libmythmetadata/videoscan.cpp
   mythtv/libs/libmythmetadata/videoscan.h
   mythtv/libs/libmythtv/cc708window.cpp
   mythtv/libs/libmythtv/channelutil.cpp
   mythtv/libs/libmythtv/deletemap.cpp
   mythtv/libs/libmythtv/deletemap.h
   mythtv/libs/libmythtv/dtvmultiplex.cpp
   mythtv/libs/libmythtv/jobqueue.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/recordingprofile.cpp
   mythtv/libs/libmythtv/recordingrule.cpp
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/subtitlescreen.h
   mythtv/libs/libmythtv/teletextscreen.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/videosource.cpp
   mythtv/libs/libmythui/mythdialogbox.cpp
   mythtv/libs/libmythui/mythdialogbox.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/myththemedmenu.cpp
   mythtv/libs/libmythui/mythuibuttontree.cpp
   mythtv/libs/libmythui/mythuitype.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythfrontend/audiogeneralsettings.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/grabbersettings.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/playbackbox.h
   mythtv/programs/mythfrontend/proglist.cpp
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/setupwizard_video.cpp
   mythtv/themes/Terra/schedule-ui.xml