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

MythTV noreply at mythtv.org
Tue Mar 27 20:18:19 UTC 2012 

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-03-26T09:42:47-07:00
   Push Date:  2012/03/27 13:17:48 -0700
  Repository:  mythtv
      Branch:  utc
New Revision:  5d645e88a2712697a081ec2f4ce93e1989844887
   Changeset:  https://github.com/MythTV/mythtv/commit/5d645e88a

Log:

Merge branch 'master' into utc

Conflicts:
	mythtv/programs/mythtranscode/mpeg2fix.cpp

Added:

   mythplugins/mytharchive/mythburn/themes/burnthemestrings.h
   mythtv/themes/MythCenter-wide/fonts/DroidSans-Bold.ttf
   mythtv/themes/MythCenter-wide/fonts/DroidSans.ttf
   mythtv/themes/MythCenter-wide/fonts/LICENSE
   mythtv/themes/MythCenter-wide/keyboard/keyboard.xml
   mythtv/themes/MythCenter-wide/music-base.xml
   mythtv/themes/MythCenter-wide/music-ui.xml
   mythtv/themes/MythCenter-wide/mytharchive-ui.xml
   mythtv/themes/MythCenter-wide/mythburn-ui.xml
   mythtv/themes/MythCenter-wide/mythnative-ui.xml
   mythtv/themes/Terra/controls-ui.xml
   mythtv/themes/Terra/musicsettings-ui.xml
   mythtv/themes/Terra/weather-ui.xml

Removed:

   mythplugins/mythzoneminder/theme/default/images/mz_function_popup.png
   mythtv/programs/mythmessage/.gitignore
   mythtv/programs/mythmessage/commandlineparser.cpp
   mythtv/programs/mythmessage/commandlineparser.h
   mythtv/programs/mythmessage/main.cpp
   mythtv/programs/mythmessage/mythmessage.pro

Modified:

   mythplugins/mytharchive/i18n/mytharchive_en_gb.qm
   mythplugins/mytharchive/i18n/mytharchive_en_gb.ts
   mythplugins/mytharchive/i18n/mytharchive_pl.qm
   mythplugins/mytharchive/i18n/mytharchive_pl.ts
   mythplugins/mytharchive/i18n/mytharchive_ru.qm
   mythplugins/mytharchive/i18n/mytharchive_ru.ts
   mythplugins/mytharchive/i18n/mytharchive_sv.qm
   mythplugins/mytharchive/i18n/mytharchive_sv.ts
   mythplugins/mytharchive/i18n/themestrings.h
   mythplugins/mytharchive/i18n/translate.pro
   mythplugins/mytharchive/mytharchive/archivesettings.cpp
   mythplugins/mytharchive/mytharchive/themeselector.cpp
   mythplugins/mytharchive/mytharchivehelper/main.cpp
   mythplugins/mytharchive/theme/default-wide/mythburn-ui.xml
   mythplugins/mytharchive/theme/default/mythburn-ui.xml
   mythplugins/mythbrowser/i18n/mythbrowser_en_gb.ts
   mythplugins/mythbrowser/i18n/mythbrowser_pl.qm
   mythplugins/mythbrowser/i18n/mythbrowser_pl.ts
   mythplugins/mythbrowser/i18n/mythbrowser_ru.qm
   mythplugins/mythbrowser/i18n/mythbrowser_ru.ts
   mythplugins/mythbrowser/i18n/mythbrowser_sv.qm
   mythplugins/mythbrowser/i18n/mythbrowser_sv.ts
   mythplugins/mythbrowser/i18n/themestrings.h
   mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
   mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp
   mythplugins/mythgallery/i18n/mythgallery_en_gb.qm
   mythplugins/mythgallery/i18n/mythgallery_en_gb.ts
   mythplugins/mythgallery/i18n/mythgallery_pl.qm
   mythplugins/mythgallery/i18n/mythgallery_pl.ts
   mythplugins/mythgallery/i18n/mythgallery_ru.qm
   mythplugins/mythgallery/i18n/mythgallery_ru.ts
   mythplugins/mythgallery/i18n/mythgallery_sv.qm
   mythplugins/mythgallery/i18n/mythgallery_sv.ts
   mythplugins/mythgallery/i18n/themestrings.h
   mythplugins/mythgallery/mythgallery/galleryfilterdlg.cpp
   mythplugins/mythgallery/mythgallery/iconview.cpp
   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_pl.qm
   mythplugins/mythgame/i18n/mythgame_pl.ts
   mythplugins/mythgame/i18n/mythgame_ru.qm
   mythplugins/mythgame/i18n/mythgame_ru.ts
   mythplugins/mythgame/i18n/mythgame_sv.qm
   mythplugins/mythgame/i18n/mythgame_sv.ts
   mythplugins/mythgame/i18n/themestrings.h
   mythplugins/mythmusic/i18n/mythmusic_en_gb.qm
   mythplugins/mythmusic/i18n/mythmusic_en_gb.ts
   mythplugins/mythmusic/i18n/mythmusic_nb.qm
   mythplugins/mythmusic/i18n/mythmusic_nb.ts
   mythplugins/mythmusic/i18n/mythmusic_pl.qm
   mythplugins/mythmusic/i18n/mythmusic_pl.ts
   mythplugins/mythmusic/i18n/mythmusic_ru.qm
   mythplugins/mythmusic/i18n/mythmusic_ru.ts
   mythplugins/mythmusic/i18n/mythmusic_sv.qm
   mythplugins/mythmusic/i18n/mythmusic_sv.ts
   mythplugins/mythmusic/i18n/themestrings.h
   mythplugins/mythmusic/i18n/translate.pro
   mythplugins/mythmusic/mythmusic/bumpscope.cpp
   mythplugins/mythmusic/mythmusic/goom/mythgoom.cpp
   mythplugins/mythmusic/mythmusic/main.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythmusic/mythmusic/musicplayer.cpp
   mythplugins/mythmusic/mythmusic/musicplayer.h
   mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
   mythplugins/mythmusic/mythmusic/searchview.cpp
   mythplugins/mythmusic/mythmusic/synaesthesia.cpp
   mythplugins/mythmusic/mythmusic/visualize.cpp
   mythplugins/mythnetvision/i18n/mythnetvision_en_gb.ts
   mythplugins/mythnetvision/i18n/mythnetvision_pl.qm
   mythplugins/mythnetvision/i18n/mythnetvision_pl.ts
   mythplugins/mythnetvision/i18n/mythnetvision_ru.qm
   mythplugins/mythnetvision/i18n/mythnetvision_ru.ts
   mythplugins/mythnetvision/i18n/mythnetvision_sv.qm
   mythplugins/mythnetvision/i18n/mythnetvision_sv.ts
   mythplugins/mythnetvision/i18n/themestrings.h
   mythplugins/mythnews/i18n/mythnews_en_gb.ts
   mythplugins/mythnews/i18n/mythnews_pl.qm
   mythplugins/mythnews/i18n/mythnews_pl.ts
   mythplugins/mythnews/i18n/mythnews_ru.qm
   mythplugins/mythnews/i18n/mythnews_ru.ts
   mythplugins/mythnews/i18n/mythnews_sv.qm
   mythplugins/mythnews/i18n/mythnews_sv.ts
   mythplugins/mythnews/i18n/themestrings.h
   mythplugins/mythweather/i18n/mythweather_en_gb.ts
   mythplugins/mythweather/i18n/mythweather_nb.qm
   mythplugins/mythweather/i18n/mythweather_nb.ts
   mythplugins/mythweather/i18n/mythweather_pl.qm
   mythplugins/mythweather/i18n/mythweather_pl.ts
   mythplugins/mythweather/i18n/mythweather_ru.qm
   mythplugins/mythweather/i18n/mythweather_ru.ts
   mythplugins/mythweather/i18n/mythweather_sv.qm
   mythplugins/mythweather/i18n/mythweather_sv.ts
   mythplugins/mythweather/i18n/themestrings.h
   mythplugins/mythzoneminder/i18n/mythzoneminder_en_gb.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_en_gb.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_pl.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_pl.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_ru.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_ru.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_sv.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_sv.ts
   mythplugins/mythzoneminder/i18n/themestrings.h
   mythplugins/mythzoneminder/theme/default-wide/zoneminder-ui.xml
   mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml
   mythtv/bindings/python/MythTV/static.py
   mythtv/html/samples/hlstest.qsp
   mythtv/html/samples/livestream_sg.qsp
   mythtv/html/samples/storagegroups.qsp
   mythtv/html/setup/js/channeleditor.js
   mythtv/html/setup/js/setup.js
   mythtv/i18n/mythfrontend_en_gb.qm
   mythtv/i18n/mythfrontend_en_gb.ts
   mythtv/i18n/mythfrontend_nb.qm
   mythtv/i18n/mythfrontend_nb.ts
   mythtv/i18n/mythfrontend_pl.qm
   mythtv/i18n/mythfrontend_pl.ts
   mythtv/i18n/mythfrontend_ru.qm
   mythtv/i18n/mythfrontend_ru.ts
   mythtv/i18n/mythfrontend_sv.qm
   mythtv/i18n/mythfrontend_sv.ts
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.h
   mythtv/libs/libmyth/mediamonitor-darwin.cpp
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmythbase/logging.cpp
   mythtv/libs/libmythbase/logging.h
   mythtv/libs/libmythbase/mthread.cpp
   mythtv/libs/libmythbase/mthread.h
   mythtv/libs/libmythbase/mthreadpool.cpp
   mythtv/libs/libmythbase/mthreadpool.h
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythmedia.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/oldsettings.cpp
   mythtv/libs/libmythmetadata/metadatafactory.cpp
   mythtv/libs/libmythmetadata/videoscan.cpp
   mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
   mythtv/libs/libmythservicecontracts/services/frontendServices.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/cetonchannel.cpp
   mythtv/libs/libmythtv/cetonrtp.cpp
   mythtv/libs/libmythtv/cetonstreamhandler.cpp
   mythtv/libs/libmythtv/cetonstreamhandler.h
   mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
   mythtv/libs/libmythtv/darwinfirewiredevice.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/dvdringbuffer.h
   mythtv/libs/libmythtv/eithelper.cpp
   mythtv/libs/libmythtv/httplivestream.cpp
   mythtv/libs/libmythtv/jobqueue.cpp
   mythtv/libs/libmythtv/metadataimagehelper.cpp
   mythtv/libs/libmythtv/mpeg/H264Parser.cpp
   mythtv/libs/libmythtv/mpeg/H264Parser.h
   mythtv/libs/libmythtv/mpeg/dvbdescriptors.h
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/previewgenerator.cpp
   mythtv/libs/libmythtv/previewgeneratorqueue.cpp
   mythtv/libs/libmythtv/privatedecoder_vda.cpp
   mythtv/libs/libmythtv/privatedecoder_vda.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_rec.cpp
   mythtv/libs/libmythtv/videodisplayprofile.cpp
   mythtv/libs/libmythtv/videodisplayprofile.h
   mythtv/libs/libmythtv/videosource.cpp
   mythtv/libs/libmythui/libmythui.pro
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythpainter.cpp
   mythtv/libs/libmythui/mythpainter.h
   mythtv/libs/libmythui/mythudplistener.cpp
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuibuttontree.cpp
   mythtv/libs/libmythui/mythuiimage.cpp
   mythtv/libs/libmythui/mythuitype.cpp
   mythtv/libs/libmythupnp/bufferedsocketdevice.cpp
   mythtv/libs/libmythupnp/serializers/xmlplistSerializer.cpp
   mythtv/libs/libmythupnp/serializers/xmlplistSerializer.h
   mythtv/libs/libmythupnp/xsd.cpp
   mythtv/programs/mythbackend/mediaserver.cpp
   mythtv/programs/mythbackend/services/guide.cpp
   mythtv/programs/mythbackend/upnpcdstv.cpp
   mythtv/programs/mythcommflag/ClassicCommDetector.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/schedulecommon.cpp
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/services/frontend.cpp
   mythtv/programs/mythfrontend/services/frontend.h
   mythtv/programs/mythfrontend/setupwizard_audio.cpp
   mythtv/programs/mythfrontend/setupwizard_audio.h
   mythtv/programs/mythfrontend/setupwizard_video.cpp
   mythtv/programs/mythfrontend/setupwizard_video.h
   mythtv/programs/mythfrontend/statusbox.cpp
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/programs/mythfrontend/videodlg.cpp
   mythtv/programs/mythfrontend/videoplayercommand.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/programs.pro
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/youtube.html
   mythtv/settings.pro
   mythtv/themes/MythCenter-wide/base.xml
   mythtv/themes/MythCenter-wide/recordings-ui.xml
   mythtv/themes/MythCenter-wide/schedule-ui.xml
   mythtv/themes/MythCenter-wide/themeinfo.xml
   mythtv/themes/MythCenter-wide/zoneminder-ui.xml
   mythtv/themes/MythCenter/schedule-ui.xml
   mythtv/themes/Terra/base.xml
   mythtv/themes/Terra/browser-ui.xml
   mythtv/themes/Terra/config-ui.xml
   mythtv/themes/Terra/news-ui.xml
   mythtv/themes/Terra/schedule-ui.xml
   mythtv/themes/default-wide/config-ui.xml
   mythtv/themes/default-wide/schedule-ui.xml
   mythtv/themes/default/config-ui.xml
   mythtv/themes/default/recordings-ui.xml
   mythtv/themes/default/schedule-ui.xml
   mythtv/themes/mythuitheme.xsd
   mythtv/themes/themestrings.h
   themestringstool/main.cpp
   themestringstool/run.sh

More information about the mythtv-firehose mailing list