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

MythTV noreply at mythtv.org
Fri Mar 9 21:24:36 UTC 2012 

      Author:  Daniel Thor Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-03-09T13:24:07-08:00
   Push Date:  2012/03/09 13:24:18 -0800
  Repository:  mythtv
      Branch:  utc
New Revision:  c9536779db53d1dd856f3e28cfda6f31e9971bd5
   Changeset:  https://github.com/MythTV/mythtv/commit/c9536779d

Log:

Merge branch 'master' into utc

Conflicts:
	mythtv/libs/libmythbase/mythcommandlineparser.cpp

Added:

   mythplugins/mythmusic/theme/default/images/mm_compartists.png
   mythplugins/mythmusic/theme/default/images/mm_compilations.png
   mythtv/html/css/wsdl.css
   mythtv/html/xslt/class.xslt
   mythtv/html/xslt/service.xslt
   mythtv/libs/libmythhdhomerun/.gitignore
   mythtv/libs/libmythupnp/xsd.cpp
   mythtv/libs/libmythupnp/xsd.h
   mythtv/programs/scripts/hardwareprofile/.gitignore

Modified:

   mythplugins/configure
   mythplugins/mytharchive/i18n/mytharchive_nb.qm
   mythplugins/mytharchive/i18n/mytharchive_nb.ts
   mythplugins/mytharchive/mytharchive/exportnative.cpp
   mythplugins/mytharchive/mytharchive/logviewer.cpp
   mythplugins/mytharchive/mytharchive/mythburn.cpp
   mythplugins/mytharchive/mytharchive/recordingselector.cpp
   mythplugins/mytharchive/mytharchive/thumbfinder.cpp
   mythplugins/mytharchive/mytharchive/videoselector.cpp
   mythplugins/mythbrowser/i18n/mythbrowser_nb.qm
   mythplugins/mythbrowser/i18n/mythbrowser_nb.ts
   mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp
   mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
   mythplugins/mythgallery/i18n/mythgallery_nb.qm
   mythplugins/mythgallery/i18n/mythgallery_nb.ts
   mythplugins/mythgame/i18n/mythgame_nb.qm
   mythplugins/mythgame/i18n/mythgame_nb.ts
   mythplugins/mythmusic/i18n/mythmusic_nb.qm
   mythplugins/mythmusic/i18n/mythmusic_nb.ts
   mythplugins/mythmusic/mythmusic/editmetadata.cpp
   mythplugins/mythmusic/mythmusic/importmusic.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.cpp
   mythplugins/mythmusic/mythmusic/musiccommon.h
   mythplugins/mythmusic/mythmusic/playlist.cpp
   mythplugins/mythmusic/mythmusic/playlist.h
   mythplugins/mythmusic/mythmusic/playlisteditorview.cpp
   mythplugins/mythmusic/mythmusic/playlisteditorview.h
   mythplugins/mythmusic/mythmusic/searchview.cpp
   mythplugins/mythmusic/mythmusic/smartplaylist.cpp
   mythplugins/mythmusic/mythmusic/visualize.cpp
   mythplugins/mythmusic/mythmusic/visualize.h
   mythplugins/mythmusic/mythmusic/visualizerview.cpp
   mythplugins/mythmusic/theme/default-wide/music-base.xml
   mythplugins/mythmusic/theme/theme.pro
   mythplugins/mythnetvision/i18n/mythnetvision_nb.qm
   mythplugins/mythnetvision/i18n/mythnetvision_nb.ts
   mythplugins/mythnews/i18n/mythnews_nb.qm
   mythplugins/mythnews/i18n/mythnews_nb.ts
   mythplugins/mythnews/mythnews/newssite.cpp
   mythplugins/mythweather/i18n/mythweather_nb.qm
   mythplugins/mythweather/i18n/mythweather_nb.ts
   mythplugins/mythzoneminder/i18n/mythzoneminder_nb.qm
   mythplugins/mythzoneminder/i18n/mythzoneminder_nb.ts
   mythplugins/mythzoneminder/mythzmserver/mythzmserver.pro
   mythtv/bindings/python/MythTV/static.py
   mythtv/configure
   mythtv/html/html.pro
   mythtv/html/js/util.qjs
   mythtv/html/samples/js/samples.js
   mythtv/i18n/mythfrontend_nb.qm
   mythtv/i18n/mythfrontend_nb.ts
   mythtv/libs/libmyth/audio/audiooutputpulse.cpp
   mythtv/libs/libmyth/audio/eldutils.cpp
   mythtv/libs/libmyth/mediamonitor-darwin.h
   mythtv/libs/libmyth/mythmediamonitor.cpp
   mythtv/libs/libmyth/schemawizard.cpp
   mythtv/libs/libmythbase/iso639.cpp
   mythtv/libs/libmythbase/iso639.h
   mythtv/libs/libmythbase/mythcdrom-darwin.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.h
   mythtv/libs/libmythbase/mythobservable.cpp
   mythtv/libs/libmythbase/mythobservable.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/serverpool.cpp
   mythtv/libs/libmythbase/serverpool.h
   mythtv/libs/libmythdvdnav/dvdread/dvd_input.c
   mythtv/libs/libmythhdhomerun/Makefile.bin
   mythtv/libs/libmythmetadata/metadatafactory.cpp
   mythtv/libs/libmythservicecontracts/datacontracts/artworkInfoList.h
   mythtv/libs/libmythservicecontracts/datacontracts/captureCardList.h
   mythtv/libs/libmythservicecontracts/datacontracts/channelInfoList.h
   mythtv/libs/libmythservicecontracts/datacontracts/encoderList.h
   mythtv/libs/libmythservicecontracts/datacontracts/frontendActionList.h
   mythtv/libs/libmythservicecontracts/datacontracts/frontendStatus.h
   mythtv/libs/libmythservicecontracts/datacontracts/lineup.h
   mythtv/libs/libmythservicecontracts/datacontracts/liveStreamInfoList.h
   mythtv/libs/libmythservicecontracts/datacontracts/logMessageList.h
   mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
   mythtv/libs/libmythservicecontracts/datacontracts/programGuide.h
   mythtv/libs/libmythservicecontracts/datacontracts/programList.h
   mythtv/libs/libmythservicecontracts/datacontracts/recRuleList.h
   mythtv/libs/libmythservicecontracts/datacontracts/settingList.h
   mythtv/libs/libmythservicecontracts/datacontracts/storageGroupDirList.h
   mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfo.h
   mythtv/libs/libmythservicecontracts/datacontracts/videoLookupInfoList.h
   mythtv/libs/libmythservicecontracts/datacontracts/videoMetadataInfoList.h
   mythtv/libs/libmythservicecontracts/datacontracts/videoMultiplexList.h
   mythtv/libs/libmythservicecontracts/datacontracts/videoSourceList.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/datadirect.cpp
   mythtv/libs/libmythtv/dbcheck.cpp
   mythtv/libs/libmythtv/firewiredevice.cpp
   mythtv/libs/libmythtv/hdhrstreamhandler.cpp
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
   mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
   mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/textsubtitleparser.cpp
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/videodisplayprofile.cpp
   mythtv/libs/libmythtv/videoout_vdpau.cpp
   mythtv/libs/libmythtv/videosource.cpp
   mythtv/libs/libmythui/libmythui.pro
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuibuttontree.cpp
   mythtv/libs/libmythui/mythuicheckbox.cpp
   mythtv/libs/libmythui/mythuitext.cpp
   mythtv/libs/libmythui/mythuitextedit.cpp
   mythtv/libs/libmythui/util-osx.h
   mythtv/libs/libmythupnp/libmythupnp.pro
   mythtv/libs/libmythupnp/mmulticastsocketdevice.cpp
   mythtv/libs/libmythupnp/serializers/serializer.cpp
   mythtv/libs/libmythupnp/serializers/soapSerializer.h
   mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
   mythtv/libs/libmythupnp/serializers/xmlSerializer.h
   mythtv/libs/libmythupnp/servicehost.cpp
   mythtv/libs/libmythupnp/wsdl.cpp
   mythtv/libs/libmythupnp/wsdl.h
   mythtv/programs/mythbackend/commandlineparser.cpp
   mythtv/programs/mythbackend/httpconfig.cpp
   mythtv/programs/mythbackend/services/content.cpp
   mythtv/programs/mythbackend/upnpcdstv.cpp
   mythtv/programs/mythcommflag/commandlineparser.cpp
   mythtv/programs/mythfilldatabase/channeldata.cpp
   mythtv/programs/mythfilldatabase/commandlineparser.cpp
   mythtv/programs/mythfrontend/commandlineparser.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/videolist.cpp
   mythtv/programs/mythlcdserver/commandlineparser.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/mythtv-setup/main.cpp
   mythtv/programs/mythtv-setup/setup.xml
   mythtv/programs/mythutil/commandlineparser.cpp
   mythtv/themes/DVR/tv_settings.xml
   mythtv/themes/Terra/base.xml
   mythtv/themes/classic/tv_settings.xml
   mythtv/themes/defaultmenu/tv_settings.xml
   mythtv/themes/mediacentermenu/tv_settings.xml

More information about the mythtv-firehose mailing list