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

[MythTV]

      Author:  Daniel Thor Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-03-09T12:43:33-08:00
   Push Date:  2012/03/09 13:24:18 -0800
  Repository:  mythtv
      Branch:  utc
New Revision:  240d59627f5a69ff6ce5f182d776687a6fa0a162
   Changeset:  https://github.com/MythTV/mythtv/commit/240d59627

Log:

Merge commit 'ba9b5d3c' into utc

Conflicts:
	mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp
	mythtv/libs/libmythbase/util.cpp

Added:

   mythtv/bindings/python/MythTV/tmdb3/README
   mythtv/bindings/python/MythTV/tmdb3/setup.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3/cache.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3/request.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3/tmdb3.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3/tmdb_api.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3/tmdb_exceptions.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3/util.py

Removed:

   mythtv/bindings/python/MythTV/tmdb3/cache.py
   mythtv/bindings/python/MythTV/tmdb3/request.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb3.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb_api.py
   mythtv/bindings/python/MythTV/tmdb3/tmdb_exceptions.py
   mythtv/bindings/python/MythTV/tmdb3/util.py

Modified:

   mythplugins/configure
   mythplugins/mytharchive/i18n/mytharchive_en_gb.qm
   mythplugins/mytharchive/i18n/mytharchive_en_gb.ts
   mythplugins/mytharchive/i18n/mytharchive_en_us.ts
   mythplugins/mytharchive/i18n/mytharchive_es_es.qm
   mythplugins/mytharchive/i18n/mytharchive_es_es.ts
   mythplugins/mytharchive/mythburn/scripts/mythburn.py
   mythplugins/mythbrowser/i18n/mythbrowser_en_us.ts
   mythplugins/mythbrowser/i18n/mythbrowser_es_es.qm
   mythplugins/mythbrowser/i18n/mythbrowser_es_es.ts
   mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
   mythplugins/mythgallery/i18n/mythgallery_en_us.ts
   mythplugins/mythgallery/i18n/mythgallery_es_es.qm
   mythplugins/mythgallery/i18n/mythgallery_es_es.ts
   mythplugins/mythgallery/theme/default-wide/gallery-ui.xml
   mythplugins/mythgallery/theme/default/gallery-ui.xml
   mythplugins/mythgame/i18n/mythgame_en_gb.qm
   mythplugins/mythgame/i18n/mythgame_en_gb.ts
   mythplugins/mythgame/i18n/mythgame_en_us.qm
   mythplugins/mythgame/i18n/mythgame_en_us.ts
   mythplugins/mythgame/i18n/mythgame_es_es.qm
   mythplugins/mythgame/i18n/mythgame_es_es.ts
   mythplugins/mythgame/mythgame/gamesettings.cpp
   mythplugins/mythmusic/i18n/mythmusic_en_gb.ts
   mythplugins/mythmusic/i18n/mythmusic_en_us.qm
   mythplugins/mythmusic/i18n/mythmusic_en_us.ts
   mythplugins/mythmusic/i18n/mythmusic_es_es.qm
   mythplugins/mythmusic/i18n/mythmusic_es_es.ts
   mythplugins/mythmusic/mythmusic/cdrip.cpp
   mythplugins/mythmusic/mythmusic/filescanner.h
   mythplugins/mythmusic/mythmusic/generalsettings.cpp
   mythplugins/mythmusic/mythmusic/importsettings.cpp
   mythplugins/mythmusic/mythmusic/main.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.h
   mythplugins/mythmusic/mythmusic/musicplayer.cpp
   mythplugins/mythmusic/mythmusic/playersettings.cpp
   mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
   mythplugins/mythmusic/mythmusic/playlisteditorview.h
   mythplugins/mythmusic/mythmusic/ratingsettings.cpp
   mythplugins/mythmusic/mythmusic/visualizationsettings.cpp
   mythplugins/mythmusic/mythmusic/visualize.cpp
   mythplugins/mythnetvision/i18n/mythnetvision_en_us.qm
   mythplugins/mythnetvision/i18n/mythnetvision_en_us.ts
   mythplugins/mythnetvision/i18n/mythnetvision_es_es.qm
   mythplugins/mythnetvision/i18n/mythnetvision_es_es.ts
   mythplugins/mythnews/i18n/mythnews_en_us.ts
   mythplugins/mythnews/i18n/mythnews_es_es.qm
   mythplugins/mythnews/i18n/mythnews_es_es.ts
   mythplugins/mythweather/i18n/mythweather_en_us.qm
   mythplugins/mythweather/i18n/mythweather_en_us.ts
   mythplugins/mythweather/i18n/mythweather_es_es.qm
   mythplugins/mythweather/i18n/mythweather_es_es.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_en_us.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_en_us.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_es_es.ts
   mythplugins/mythzoneminder/mythzmserver/mythzmserver.pro
   mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
   mythplugins/mythzoneminder/mythzmserver/zmserver.h
   mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmclient.h
   mythplugins/mythzoneminder/mythzoneminder/zmdefines.h
   mythplugins/mythzoneminder/mythzoneminder/zmevents.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmplayer.cpp
   mythplugins/mythzoneminder/mythzoneminder/zmsettings.cpp
   mythtv/bindings/perl/MythTV.pm
   mythtv/bindings/python/MythTV/static.py
   mythtv/configure
   mythtv/i18n/mythfrontend_en_gb.qm
   mythtv/i18n/mythfrontend_en_gb.ts
   mythtv/i18n/mythfrontend_en_us.qm
   mythtv/i18n/mythfrontend_en_us.ts
   mythtv/i18n/mythfrontend_es_es.qm
   mythtv/i18n/mythfrontend_es_es.ts
   mythtv/libs/libmyth/audio/audiooutputca.cpp
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmyth/remoteutil.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/storagegroup.cpp
   mythtv/libs/libmythbase/util.cpp
   mythtv/libs/libmythhdhomerun/hdhomerun_os_posix.h
   mythtv/libs/libmythmetadata/libmythmetadata.pro
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
   mythtv/libs/libmythtv/channelscan/channelscan_sm.h
   mythtv/libs/libmythtv/darwinfirewiredevice.cpp
   mythtv/libs/libmythtv/darwinfirewiredevice.h
   mythtv/libs/libmythtv/dbchannelinfo.cpp
   mythtv/libs/libmythtv/dbchannelinfo.h
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/deletemap.cpp
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/firewirechannel.cpp
   mythtv/libs/libmythtv/firewiredevice.cpp
   mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/osd.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/videodisplayprofile.cpp
   mythtv/libs/libmythtv/videoout_xv.cpp
   mythtv/libs/libmythui/cecadapter.cpp
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythscreentype.cpp
   mythtv/libs/libmythui/mythuitext.cpp
   mythtv/libs/libmythui/mythuitextedit.cpp
   mythtv/libs/libmythui/mythuitextedit.h
   mythtv/libs/libmythui/xmlparsebase.cpp
   mythtv/programs/mythbackend/autoexpire.cpp
   mythtv/programs/mythbackend/autoexpire.h
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythbackend/services/serviceUtil.cpp
   mythtv/programs/mythfrontend/editvideometadata.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/guidegrid.cpp
   mythtv/programs/mythfrontend/guidegrid.h
   mythtv/programs/mythfrontend/networkcontrol.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythtv-setup/backendsettings.cpp
   mythtv/programs/mythtv-setup/importicons.cpp
   mythtv/settings.pro
   mythtv/themes/Terra/osd.xml
   mythtv/themes/default-wide/osd.xml
   mythtv/themes/mythuitheme.xsd