[mythtv-firehose] mythtv/new-logging commit: 0b9625e76 by Gavin Hurlbut (Beirdo)

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-09T21:05:13-07:00
   Push Date:  2011/05/09 21:06:42 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  0b9625e76350cfc93ba88023d73de0f90941c3c7
   Changeset:  https://github.com/MythTV/mythtv/commit/0b9625e76

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythtv/playercontext.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/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/mpeg/tspacket.h
   mythtv/libs/libmythtv/mythdvdplayer.cpp
   mythtv/libs/libmythtv/mythdvdplayer.h
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/playercontext.cpp
   mythtv/libs/libmythtv/playercontext.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/libmythtv/vsync.h
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythui/mythuiimage.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.h
   mythtv/programs/mythfrontend/main.cpp