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

MythTV noreply at mythtv.org
Tue Mar 13 14:56:32 UTC 2012


      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-03-13T07:56:13-07:00
   Push Date:  2012/03/13 07:56:20 -0700
  Repository:  mythtv
      Branch:  utc
New Revision:  d212424f863761bf600a80266cac55fe659004b6
   Changeset:  https://github.com/MythTV/mythtv/commit/d212424f8

Log:

Merge branch 'master' into utc

Conflicts:
	mythtv/libs/libmythtv/dbcheck.cpp
	mythtv/libs/libmythtv/dtvrecorder.cpp

Modified:

   mythplugins/mytharchive/i18n/mytharchive_de.qm
   mythplugins/mytharchive/i18n/mytharchive_de.ts
   mythplugins/mytharchive/i18n/mytharchive_el.qm
   mythplugins/mytharchive/i18n/mytharchive_el.ts
   mythplugins/mythbrowser/i18n/mythbrowser_de.qm
   mythplugins/mythbrowser/i18n/mythbrowser_de.ts
   mythplugins/mythbrowser/i18n/mythbrowser_el.qm
   mythplugins/mythbrowser/i18n/mythbrowser_el.ts
   mythplugins/mythbrowser/i18n/mythbrowser_ru.qm
   mythplugins/mythbrowser/i18n/mythbrowser_ru.ts
   mythplugins/mythgallery/i18n/mythgallery_de.ts
   mythplugins/mythgallery/i18n/mythgallery_el.qm
   mythplugins/mythgallery/i18n/mythgallery_el.ts
   mythplugins/mythgallery/i18n/mythgallery_ru.qm
   mythplugins/mythgallery/i18n/mythgallery_ru.ts
   mythplugins/mythgame/i18n/mythgame_de.qm
   mythplugins/mythgame/i18n/mythgame_de.ts
   mythplugins/mythgame/i18n/mythgame_el.qm
   mythplugins/mythgame/i18n/mythgame_el.ts
   mythplugins/mythgame/i18n/mythgame_ru.qm
   mythplugins/mythgame/i18n/mythgame_ru.ts
   mythplugins/mythmusic/i18n/mythmusic_de.qm
   mythplugins/mythmusic/i18n/mythmusic_de.ts
   mythplugins/mythmusic/i18n/mythmusic_el.qm
   mythplugins/mythmusic/i18n/mythmusic_el.ts
   mythplugins/mythmusic/i18n/mythmusic_ru.qm
   mythplugins/mythmusic/i18n/mythmusic_ru.ts
   mythplugins/mythmusic/theme/default/music-base.xml
   mythplugins/mythnetvision/i18n/mythnetvision_de.ts
   mythplugins/mythnews/i18n/mythnews_de.ts
   mythplugins/mythnews/i18n/mythnews_el.ts
   mythplugins/mythnews/i18n/mythnews_ru.ts
   mythplugins/mythweather/i18n/mythweather_de.ts
   mythplugins/mythweather/i18n/mythweather_el.qm
   mythplugins/mythweather/i18n/mythweather_el.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_de.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_de.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_el.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_el.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_ru.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_ru.ts
   mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp
   mythtv/bindings/python/setup.py
   mythtv/html/xslt/class.xslt
   mythtv/html/xslt/service.xslt
   mythtv/i18n/mythfrontend_de.qm
   mythtv/i18n/mythfrontend_de.ts
   mythtv/i18n/mythfrontend_el.qm
   mythtv/i18n/mythfrontend_el.ts
   mythtv/i18n/mythfrontend_ru.qm
   mythtv/i18n/mythfrontend_ru.ts
   mythtv/libs/libmyth/audio/audiooutputsettings.cpp
   mythtv/libs/libmythbase/logging.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythdownloadmanager.h
   mythtv/libs/libmythbase/serverpool.cpp
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/dtvrecorder.cpp
   mythtv/libs/libmythtv/eithelper.cpp
   mythtv/libs/libmythtv/hdhrstreamhandler.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederrtp.cpp
   mythtv/libs/libmythtv/nuppeldecoder.cpp
   mythtv/libs/libmythtv/previewgenerator.cpp
   mythtv/libs/libmythtv/previewgeneratorqueue.cpp
   mythtv/libs/libmythtv/recorderbase.cpp
   mythtv/libs/libmythtv/recorderbase.h
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/subtitlescreen.h
   mythtv/libs/libmythtv/videodbcheck.cpp
   mythtv/libs/libmythui/mythdialogbox.cpp
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.h
   mythtv/libs/libmythupnp/xsd.cpp
   mythtv/programs/mythfilldatabase/commandlineparser.cpp
   mythtv/programs/mythfilldatabase/main.cpp
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/programs/mythfrontend/videodlg.cpp
   mythtv/programs/mythtranscode/commandlineparser.cpp
   mythtv/programs/mythtranscode/main.cpp



More information about the mythtv-firehose mailing list