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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-26T08:04:40-07:00
   Push Date:  2011/07/26 08:18:33 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  2f800f23e2d497c85da00c92c9332f68c24b2b04
   Changeset:  https://github.com/MythTV/mythtv/commit/2f800f23e

Log:

Merge branch 'master' into mythtv-rec2

Added:

   mythtv/libs/libmythbase/logging.cpp
   mythtv/libs/libmythbase/logging.h
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/__init__.py
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/data_mythtv.py
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/main.py
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/makeopts.py
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/orddict.py
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/request.py
   mythtv/programs/scripts/hardwareprofile/distros/mythtv_data/uuiddb.py

Removed:

   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/_mismatch.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/_mismatch_contacts.sh
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/compileflags.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/features.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/generatedpackages.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/globaluseflags.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/installedpackages.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/main.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/mirrors.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/mirrorselect/__init__.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/mirrorselect/mirrorparser3.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/overlays.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/packageprivacy.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/packagestar.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/systemprofile.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/tools/__init__.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/tools/conf.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/tools/maintreedir.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/tools/overlayparser.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/tools/syncfile.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/tools/wrappers.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/trivials.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/worldset.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/__init__.py
   mythtv/programs/scripts/hardwareprofile/distros/gentoo/makeopts.py
   mythtv/programs/scripts/hardwareprofile/smolt_mythtv.py

Modified:

   mythtv/external/FFmpeg/libavformat/mpegts.c
   mythtv/libs/libmyth/audio/audiopulsehandler.cpp
   mythtv/libs/libmyth/generictree.cpp
   mythtv/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmythbase/libmythbase.pro
   mythtv/libs/libmythbase/mythbaseutil.h
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.h
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/verbosedefs.h
   mythtv/libs/libmythhdhomerun/hdhomerun_device.c
   mythtv/libs/libmythmetadata/metadatadownload.cpp
   mythtv/libs/libmythmetadata/metadatadownload.h
   mythtv/libs/libmythmetadata/metadatafactory.cpp
   mythtv/libs/libmythmetadata/metadatafactory.h
   mythtv/libs/libmythservicecontracts/services/contentServices.h
   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/DeviceReadBuffer.h
   mythtv/libs/libmythtv/metadataimagehelper.cpp
   mythtv/libs/libmythtv/util-osd.cpp
   mythtv/libs/libmythui/lirc.cpp
   mythtv/libs/libmythui/mythuitype.cpp
   mythtv/libs/libmythupnp/upnpcds.cpp
   mythtv/libs/libmythupnp/upnpcds.h
   mythtv/programs/mythbackend/housekeeper.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/services/content.cpp
   mythtv/programs/mythbackend/services/content.h
   mythtv/programs/mythbackend/upnpcdstv.cpp
   mythtv/programs/mythbackend/upnpcdsvideo.cpp
   mythtv/programs/mythccextractor/commandlineparser.cpp
   mythtv/programs/mythfrontend/playbackbox.cpp
   mythtv/programs/mythfrontend/scheduleeditor.cpp
   mythtv/programs/mythfrontend/scheduleeditor.h
   mythtv/programs/mythfrontend/setupwizard_audio.cpp
   mythtv/programs/mythfrontend/setupwizard_audio.h
   mythtv/programs/mythfrontend/setupwizard_video.cpp
   mythtv/programs/mythfrontend/setupwizard_video.h
   mythtv/programs/mythmetadatalookup/lookup.h
   mythtv/programs/mythmetadatalookup/main.cpp
   mythtv/programs/scripts/hardwareprofile/defaults.cfg
   mythtv/programs/scripts/hardwareprofile/deleteProfile.py
   mythtv/programs/scripts/hardwareprofile/devicelist.py
   mythtv/programs/scripts/hardwareprofile/distros/all.py
   mythtv/programs/scripts/hardwareprofile/distros/distro.py
   mythtv/programs/scripts/hardwareprofile/gate.py
   mythtv/programs/scripts/hardwareprofile/getLink.py
   mythtv/programs/scripts/hardwareprofile/hwdata.py
   mythtv/programs/scripts/hardwareprofile/os_detect.py
   mythtv/programs/scripts/hardwareprofile/scan.py
   mythtv/programs/scripts/hardwareprofile/sendProfile.py
   mythtv/programs/scripts/hardwareprofile/smolt.py
   mythtv/programs/scripts/hardwareprofile/software.py
   mythtv/programs/scripts/hardwareprofile/uuiddb.py
   mythtv/programs/scripts/metadata/Movie/tmdb.py
   mythtv/programs/scripts/metadata/Television/ttvdb.py
   mythtv/themes/Terra/recordings-ui.xml
   mythtv/themes/default-wide/config-ui.xml