[mythtv-commits] mythtv commit: r11322 - in branches/multiuser/mythtv by asoboleva

[mythtv at cvs.mythtv.org]

      Author: asoboleva
        Date: 2006-09-28 21:05:40 +0000 (Thu, 28 Sep 2006)
New Revision: 11322
   Changeset: http://cvs.mythtv.org/trac/changeset/11322

Added:

   branches/multiuser/mythtv/contrib/master_iconmap/
   branches/multiuser/mythtv/themes/default/watched.png

Removed:

   branches/multiuser/mythtv/contrib/master_iconmap.xml

Modified:

   branches/multiuser/mythtv/docs/mythtv-HOWTO.sgml
   branches/multiuser/mythtv/libs/libmyth/audiooutputbase.h
   branches/multiuser/mythtv/libs/libmyth/audiooutputca.cpp
   branches/multiuser/mythtv/libs/libmyth/audiooutputca.h
   branches/multiuser/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp
   branches/multiuser/mythtv/libs/libmythtv/NuppelVideoPlayer.h
   branches/multiuser/mythtv/libs/libmythtv/dbcheck.cpp
   branches/multiuser/mythtv/libs/libmythtv/programinfo.cpp
   branches/multiuser/mythtv/libs/libmythtv/programinfo.h
   branches/multiuser/mythtv/libs/libmythtv/tv_play.cpp
   branches/multiuser/mythtv/libs/libmythtv/videoout_quartz.cpp
   branches/multiuser/mythtv/libs/libmythtv/videosource.cpp
   branches/multiuser/mythtv/libs/libmythui/mythpainter_qt.cpp
   branches/multiuser/mythtv/programs/mythbackend/autoexpire.cpp
   branches/multiuser/mythtv/programs/mythbackend/main.cpp
   branches/multiuser/mythtv/programs/mythbackend/mainserver.cpp
   branches/multiuser/mythtv/programs/mythbackend/scheduler.cpp
   branches/multiuser/mythtv/programs/mythbackend/scheduler.h
   branches/multiuser/mythtv/programs/mythfrontend/globalsettings.cpp
   branches/multiuser/mythtv/programs/mythfrontend/main.cpp
   branches/multiuser/mythtv/programs/mythfrontend/playbackbox.cpp
   branches/multiuser/mythtv/programs/mythfrontend/playbackbox.h
   branches/multiuser/mythtv/programs/mythfrontend/programrecpriority.cpp
   branches/multiuser/mythtv/programs/mythfrontend/programrecpriority.h
   branches/multiuser/mythtv/programs/mythtranscode/main.cpp
   branches/multiuser/mythtv/programs/mythtv-setup/main.cpp
   branches/multiuser/mythtv/themes/G.A.N.T./ui.xml
   branches/multiuser/mythtv/themes/blue/ui.xml
   branches/multiuser/mythtv/themes/blueosd/osd.xml
   branches/multiuser/mythtv/themes/defaultosd/osd.xml

Log:

Merge r11120:11170 from trunk/mythtv