[mythtv-firehose] mythtv/ceton commit: 8f648dda7 by Daniel Thor Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Thor Kristjansson <danielk at cuymedia.net>
 Change Date:  2012-03-15T13:17:10-07:00
   Push Date:  2012/03/16 06:40:42 -0700
  Repository:  mythtv
      Branch:  ceton
New Revision:  8f648dda7451d7551a430c4be68574f9e9d8674f
   Changeset:  https://github.com/MythTV/mythtv/commit/8f648dda7

Log:

Merge branch 'rtp' into ceton

Conflicts:
	mythtv/libs/libmythtv/cetonrtp.cpp

Added:

   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

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/theme/default-wide/mythburn-ui.xml
   mythplugins/mytharchive/theme/default/mythburn-ui.xml
   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/mythzoneminder/theme/default-wide/zoneminder-ui.xml
   mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml
   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/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/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythservicecontracts/services/frontendServices.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/cetonchannel.cpp
   mythtv/libs/libmythtv/cetonstreamhandler.cpp
   mythtv/libs/libmythtv/cetonstreamhandler.h
   mythtv/libs/libmythtv/darwinfirewiredevice.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/dvdringbuffer.h
   mythtv/libs/libmythtv/jobqueue.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/privatedecoder_vda.h
   mythtv/libs/libmythtv/videodisplayprofile.cpp
   mythtv/libs/libmythtv/videodisplayprofile.h
   mythtv/libs/libmythui/libmythui.pro
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythuibuttontree.cpp
   mythtv/libs/libmythui/mythuiimage.cpp
   mythtv/libs/libmythupnp/serializers/xmlplistSerializer.cpp
   mythtv/libs/libmythupnp/serializers/xmlplistSerializer.h
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/services/frontend.cpp
   mythtv/programs/mythfrontend/services/frontend.h
   mythtv/programs/mythfrontend/videodlg.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/programs.pro
   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/zoneminder-ui.xml
   mythtv/themes/MythCenter/schedule-ui.xml
   mythtv/themes/default-wide/schedule-ui.xml
   mythtv/themes/default/schedule-ui.xml