[mythtv-firehose] mythtv/mythtv-rec2 commit: 63b74f236 by Daniel Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-05-11T09:38:29-07:00
   Push Date:  2011/05/11 09:46:23 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  63b74f236299d82765a41ec920e163488455f568
   Changeset:  https://github.com/MythTV/mythtv/commit/63b74f236

Log:

Merge commit 'c65b533' into mythtv-rec2

Conflicts:
	mythtv/programs/mythbackend/mainserver.cpp

Added:

   mythplugins/mythbrowser/theme/default/images/mb_default_favicon.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_1.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_2.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_3.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_4.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_5.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_6.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_7.png
   mythplugins/mythbrowser/theme/default/images/mb_loading_8.png

Modified:

   mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
   mythplugins/mythbrowser/mythbrowser/mythbrowser.h
   mythplugins/mythbrowser/mythbrowser/webpage.cpp
   mythplugins/mythbrowser/mythbrowser/webpage.h
   mythplugins/mythbrowser/theme/default-wide/browser-ui.xml
   mythplugins/mythbrowser/theme/default/browser-ui.xml
   mythplugins/mythbrowser/theme/theme.pro
   mythtv/filters/linearblend/filter_linearblend.c
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmythbase/util.cpp
   mythtv/libs/libmythtv/decoderbase.cpp
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/dvdringbuffer.h
   mythtv/libs/libmythtv/mythdvdplayer.cpp
   mythtv/libs/libmythtv/mythdvdplayer.h
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/videoout_d3d.h
   mythtv/libs/libmythtv/videoout_opengl.h
   mythtv/libs/libmythtv/videoout_vdpau.h
   mythtv/libs/libmythtv/videoout_xv.h
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuiimage.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.h
   mythtv/libs/libmythupnp/serverSideScripting.cpp
   mythtv/programs/mythfrontend/main.cpp