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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-02T11:16:47-07:00
   Push Date:  2011/05/02 11:17:05 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  02616f0d0d884d04d6a6b331f49450d21d58faa8
   Changeset:  https://github.com/MythTV/mythtv/commit/02616f0d0

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythplugins/mythmusic/mythmusic/avfdecoder.cpp
	mythtv/libs/libmythbase/mythversion.h

Removed:

   mythtv/html/misc/wsdl.html

Modified:

   mythplugins/mythmusic/mythmusic/avfdecoder.cpp
   mythtv/html/htmlstrings.h
   mythtv/html/js/util.qjs
   mythtv/html/misc/overview.qsp
   mythtv/html/samples/storagegroups.qsp
   mythtv/html/setup/channeleditor-channeldetail.html
   mythtv/html/setup/jobqueue-jobs.qsp
   mythtv/html/setup/js/channeleditor.js
   mythtv/html/setup/wizard-network.qsp
   mythtv/libs/libmyth/audio/audiooutput.h
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputbase.h
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.cpp
   mythtv/libs/libmyth/audio/audiooutputdigitalencoder.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbluray/bluray.c
   mythtv/libs/libmythbluray/hdmv/hdmv_vm.c
   mythtv/libs/libmythbluray/hdmv/hdmv_vm.h
   mythtv/libs/libmythtv/audioplayer.cpp
   mythtv/libs/libmythtv/audioplayer.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/channelsettings.cpp
   mythtv/libs/libmythtv/openglvideo.cpp
   mythtv/libs/libmythtv/openglvideo.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythtv/videoout_opengl.cpp
   mythtv/libs/libmythtv/videoout_opengl.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythmainwindow.h
   mythtv/libs/libmythui/mythrender_base.h
   mythtv/libs/libmythui/mythrender_opengl.cpp
   mythtv/libs/libmythui/mythrender_opengl.h
   mythtv/libs/libmythui/mythrender_opengl1.h
   mythtv/libs/libmythui/mythrender_opengl2.h
   mythtv/libs/libmythui/myththemedmenu.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythupnp/serverSideScripting.cpp
   mythtv/programs/mythfrontend/guidegrid.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/progfind.cpp
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/viewscheduled.cpp