[mythtv-firehose] mythtv/rtp commit: 4b8e0f6ea by Daniel Thor Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Thor Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-03-30T08:38:24-07:00
   Push Date:  2012/03/30 08:38:41 -0700
  Repository:  mythtv
      Branch:  rtp
New Revision:  4b8e0f6ea610744d6d9b1e0ed11f3a11548280ec
   Changeset:  https://github.com/MythTV/mythtv/commit/4b8e0f6ea

Log:

Merge branch 'master' into rtp

Added:

   mythplugins/mytharchive/i18n/mytharchive_zh_hk.qm
   mythplugins/mytharchive/i18n/mytharchive_zh_hk.ts
   mythtv/bindings/python/tmdb3/.gitignore
   mythtv/bindings/python/tmdb3/tmdb3/cache_engine.py
   mythtv/bindings/python/tmdb3/tmdb3/cache_file.py
   mythtv/bindings/python/tmdb3/tmdb3/cache_null.py

Modified:

   mythplugins/mytharchive/i18n/i18n.pro
   mythplugins/mytharchive/i18n/mytharchive_fr.qm
   mythplugins/mytharchive/i18n/mytharchive_fr.ts
   mythplugins/mytharchive/i18n/translate.pro
   mythplugins/mythbrowser/i18n/mythbrowser_fr.qm
   mythplugins/mythbrowser/i18n/mythbrowser_fr.ts
   mythplugins/mythgallery/i18n/mythgallery_fr.qm
   mythplugins/mythgallery/i18n/mythgallery_fr.ts
   mythplugins/mythgame/i18n/mythgame_fr.qm
   mythplugins/mythgame/i18n/mythgame_fr.ts
   mythplugins/mythmusic/i18n/mythmusic_fr.qm
   mythplugins/mythmusic/i18n/mythmusic_fr.ts
   mythplugins/mythnetvision/i18n/mythnetvision_fr.qm
   mythplugins/mythnetvision/i18n/mythnetvision_fr.ts
   mythplugins/mythnews/i18n/mythnews_fr.qm
   mythplugins/mythnews/i18n/mythnews_fr.ts
   mythplugins/mythweather/i18n/mythweather_fr.qm
   mythplugins/mythweather/i18n/mythweather_fr.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_fr.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_fr.ts
   mythtv/bindings/python/tmdb3/README
   mythtv/bindings/python/tmdb3/tmdb3/__init__.py
   mythtv/bindings/python/tmdb3/tmdb3/cache.py
   mythtv/bindings/python/tmdb3/tmdb3/tmdb_api.py
   mythtv/bindings/python/tmdb3/tmdb3/util.py
   mythtv/i18n/mythfrontend_fr.qm
   mythtv/i18n/mythfrontend_fr.ts
   mythtv/i18n/mythfrontend_zh_hk.qm
   mythtv/i18n/mythfrontend_zh_hk.ts
   mythtv/libs/libmythtv/cetonstreamhandler.cpp
   mythtv/libs/libmythtv/cetonstreamhandler.h
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythfrontend/networkcontrol.cpp
   mythtv/programs/mythutil/commandlineparser.cpp