[mythtv-commits] mythtv commit: r11564 - in branches/release-0-20-fixes/mythplugins/mytharchive by paulh

[mythtv at cvs.mythtv.org]

      Author: paulh
        Date: 2006-10-17 14:47:47 +0000 (Tue, 17 Oct 2006)
New Revision: 11564
   Changeset: http://cvs.mythtv.org/trac/changeset/11564

Added:

   branches/release-0-20-fixes/mythplugins/mytharchive/images/ma_updown.png
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/intro/ntsc_blank.mpg
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/intro/pal_blank.mpg
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/funky1.ac3
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/funky2.ac3
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/menumusic.ac3
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/silence.ac3

Removed:

   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/funky1.mp2
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/funky2.mp2
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/menumusic.mp2
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/music/silence.mp2

Modified:

   branches/release-0-20-fixes/mythplugins/mytharchive/mytharchive/archivesettings.cpp
   branches/release-0-20-fixes/mythplugins/mytharchive/mytharchive/mytharchive.pro
   branches/release-0-20-fixes/mythplugins/mytharchive/mytharchive/mythburnwizard.cpp
   branches/release-0-20-fixes/mythplugins/mytharchive/mytharchive/mythburnwizard.h
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_ntsc.xml
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/encoder_profiles/ffmpeg_dvd_pal.xml
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/intro/ntsc_mythlogo_intro.mpg
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/intro/ntsc_mythtv_intro.mpg
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/intro/ntsc_whiteintro.mpg
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/intro/pal_mythtv_intro.mpg
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/scripts/mythburn.py
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/themes/G.A.N.T./theme.xml
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/themes/MythCenter - Autoplay/theme.xml
   branches/release-0-20-fixes/mythplugins/mytharchive/mythburn/themes/MythCenter/theme.xml

Log:

Merge all the remaining fixes from trunk into the fixes branch.
Some of the changes aren't strictly fixes but it was easier just to
merge 11167:11563.

I'll try to keep the two in sync a little better from now on :-)