[mythtv-firehose] mythtv/master commit: 3e26728e7 by Jean-Yves Avenard (jyavenard)

MythTV noreply at mythtv.org
Thu Mar 15 03:13:19 UTC 2012


      Author:  Jean-Yves Avenard <jyavenard at mythtv.org>
 Change Date:  2012-03-14T20:11:13-07:00
   Push Date:  2012/03/14 20:13:09 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  3e26728e7ed18ebd109612b4175bfa89466885ab
   Changeset:  https://github.com/MythTV/mythtv/commit/3e26728e7

Log:

Merge branch 'master' of github.com:MythTV/mythtv

Conflicts:
	mythtv/libs/libmythbase/mythversion.h

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/mythzoneminder/theme/default-wide/zoneminder-ui.xml
   mythplugins/mythzoneminder/theme/default/zoneminder-ui.xml
   mythtv/libs/libmyth/mediamonitor-darwin.cpp
   mythtv/libs/libmythbase/mythcorecontext.h
   mythtv/libs/libmythbase/mythdownloadmanager.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythservicecontracts/services/frontendServices.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/dvdringbuffer.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythuibuttontree.cpp
   mythtv/libs/libmythupnp/serializers/xmlplistSerializer.cpp
   mythtv/libs/libmythupnp/serializers/xmlplistSerializer.h
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/services/frontend.cpp
   mythtv/programs/mythfrontend/services/frontend.h
   mythtv/programs/programs.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



More information about the mythtv-firehose mailing list