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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-08T07:39:50-07:00
   Push Date:  2011/07/08 08:18:10 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  36d30e4e47f99aecadf52c1ffb01549e2204fdb7
   Changeset:  https://github.com/MythTV/mythtv/commit/36d30e4e4

Log:

Merge branch 'master' into mythtv-rec2

Modified:

   mythplugins/mythgallery/mythgallery/gallerysettings.cpp
   mythplugins/mythgame/mythgame/scripts/giantbomb/XSLT/giantbombGame.xsl
   mythplugins/mythgame/mythgame/scripts/giantbomb/XSLT/giantbombQuery.xsl
   mythplugins/mythweather/mythweather/scripts/us_nws/bp16mr06.dbx
   mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbQuery.xsl
   mythtv/bindings/python/MythTV/tmdb/XSLT/tmdbVideo.xsl
   mythtv/bindings/python/MythTV/ttvdb/XSLT/tvdbQuery.xsl
   mythtv/bindings/python/MythTV/ttvdb/XSLT/tvdbVideo.xsl
   mythtv/html/css/ui.jqgrid.css
   mythtv/html/js/grid.locale-en.js
   mythtv/html/js/jquery.jqGrid.min.js
   mythtv/html/js/jqueryFileTree/jqueryFileTree.css
   mythtv/html/misc/overview.qsp
   mythtv/libs/libmyth/libmyth.def
   mythtv/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythhdhomerun/hdhomerun_channelscan.c
   mythtv/libs/libmythhdhomerun/hdhomerun_config.c
   mythtv/libs/libmythhdhomerun/hdhomerun_device.c
   mythtv/libs/libmythhdhomerun/hdhomerun_discover.c
   mythtv/libs/libmythhdhomerun/hdhomerun_discover.h
   mythtv/libs/libmythhdhomerun/hdhomerun_pkt.h
   mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
   mythtv/libs/libmythtv/asichannel.cpp
   mythtv/libs/libmythtv/asirecorder.cpp
   mythtv/libs/libmythtv/asisignalmonitor.cpp
   mythtv/libs/libmythtv/asistreamhandler.cpp
   mythtv/libs/libmythtv/jobqueue.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythrender_opengl.cpp
   mythtv/libs/libmythui/mythrender_opengl.h
   mythtv/programs/mythbackend/services/serviceUtil.cpp
   mythtv/programs/mythbackend/services/serviceUtil.h
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythfilldatabase/channeldata.cpp
   mythtv/programs/mythfilldatabase/filldata.cpp
   mythtv/programs/mythfilldatabase/icondata.cpp
   mythtv/programs/mythfilldatabase/main.cpp
   mythtv/programs/mythfilldatabase/xmltvparser.cpp
   mythtv/programs/mythfrontend/actionset.cpp
   mythtv/programs/mythfrontend/audiogeneralsettings.cpp
   mythtv/programs/mythfrontend/backendconnectionmanager.cpp
   mythtv/programs/mythfrontend/channelrecpriority.cpp
   mythtv/programs/mythfrontend/customedit.cpp
   mythtv/programs/mythfrontend/custompriority.cpp
   mythtv/programs/mythfrontend/editvideometadata.cpp
   mythtv/programs/mythfrontend/exitprompt.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/mythfrontend/grabbersettings.cpp
   mythtv/programs/mythfrontend/guidegrid.cpp
   mythtv/programs/mythfrontend/keygrabber.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/manualschedule.cpp
   mythtv/programs/mythfrontend/mediarenderer.cpp
   mythtv/programs/mythfrontend/mythcontrols.cpp
   mythtv/programs/mythfrontend/mythfexml.cpp
   mythtv/programs/mythfrontend/networkcontrol.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/playbackboxhelper.cpp
   mythtv/programs/mythfrontend/progdetails.cpp
   mythtv/programs/mythfrontend/progfind.cpp
   mythtv/programs/mythfrontend/proglist.cpp
   mythtv/programs/mythfrontend/proglist_helpers.cpp
   mythtv/programs/mythfrontend/programrecpriority.cpp
   mythtv/programs/mythfrontend/schedulecommon.cpp
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/screenwizard.cpp
   mythtv/programs/mythfrontend/setupwizard_audio.cpp
   mythtv/programs/mythfrontend/setupwizard_general.cpp
   mythtv/programs/mythfrontend/setupwizard_video.cpp
   mythtv/programs/mythfrontend/statusbox.cpp
   mythtv/programs/mythfrontend/themechooser.cpp
   mythtv/programs/mythfrontend/upnpscanner.cpp
   mythtv/programs/mythfrontend/videodlg.cpp
   mythtv/programs/mythfrontend/videofileassoc.cpp
   mythtv/programs/mythfrontend/videofilter.cpp
   mythtv/programs/mythfrontend/videolist.cpp
   mythtv/programs/mythfrontend/videometadatasettings.cpp
   mythtv/programs/mythfrontend/videoplayersettings.cpp
   mythtv/programs/mythfrontend/videopopups.cpp
   mythtv/programs/mythfrontend/viewscheduled.cpp
   mythtv/programs/mythfrontend/viewschedulediff.cpp
   mythtv/programs/mythtranscode/commandlineparser.cpp
   mythtv/programs/mythtranscode/main.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/mythtranscode/transcode.h
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/bleedingedgeRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/bliptvRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/chrisPirilloRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/cinemarvRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/dailyappRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/earthtouchRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/ecogeeksRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/howcastRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/linuxActionRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/macmostRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/revision3RSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/terraRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/traileraddictRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/youtubeRSS_item.xsl
   mythtv/programs/scripts/internetcontent/nv_python_libs/configs/XSLT/youtubeTrailersRSS_item.xsl
   mythtv/programs/scripts/metadata/Television/ttvdb.py