Mailing List Archive

Author: Gavin Hurlbut <ghurlbut@mythtv.org>
Change Date: 2011-05-23T20:06:28-07:00
Push Date: 2011/05/23 20:06:45 -0700
Repository: mythtv
Branch: new-logging
New Revision: 2fa50fac43fffbb993e3e6f109e1e72bc2c06ccb
Changeset: https://github.com/MythTV/mythtv/commit/2fa50fac4

Log:

Merge branch 'master' into new-logging

Conflicts:
mythtv/libs/libmythbase/mythversion.h
mythtv/libs/libmythtv/videoout_directfb.cpp
mythtv/programs/mythbackend/config_backend_general.xml

Added:

mythtv/i18n/mythfrontend_zh_cn.qm
mythtv/i18n/mythfrontend_zh_cn.ts
mythtv/libs/libmythservicecontracts/datacontracts/timeZoneInfo.h

Removed:

mythtv/libs/libmythtv/videoout_directfb.cpp
mythtv/libs/libmythtv/videoout_directfb.h

Modified:

mythplugins/configure
mythplugins/mythbrowser/mythbrowser/main.cpp
mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
mythplugins/mythbrowser/mythbrowser/mythbrowser.h
mythplugins/mythmusic/mythmusic/cddecoder.cpp
mythplugins/mythmusic/mythmusic/importmusic.cpp
mythtv/bindings/perl/MythTV.pm
mythtv/bindings/python/MythTV/static.py
mythtv/configure
mythtv/i18n/i18n.pro
mythtv/i18n/translate.pro
mythtv/libs/libmyth/netutils.cpp
mythtv/libs/libmyth/programinfo.cpp
mythtv/libs/libmyth/rssparse.cpp
mythtv/libs/libmyth/uitypes.cpp
mythtv/libs/libmythbase/msocketdevice_unix.cpp
mythtv/libs/libmythbase/msocketdevice_win.cpp
mythtv/libs/libmythbase/mythdownloadmanager.cpp
mythtv/libs/libmythbase/mythdownloadmanager.h
mythtv/libs/libmythbase/mythversion.h
mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro
mythtv/libs/libmythservicecontracts/services/mythServices.h
mythtv/libs/libmythtv/datadirect.cpp
mythtv/libs/libmythtv/dbcheck.cpp
mythtv/libs/libmythtv/dvdringbuffer.cpp
mythtv/libs/libmythtv/libmythtv.pro
mythtv/libs/libmythtv/ringbuffer.cpp
mythtv/libs/libmythtv/tv_play.cpp
mythtv/libs/libmythtv/videodisplayprofile.cpp
mythtv/libs/libmythtv/videooutbase.cpp
mythtv/libs/libmythui/mythdisplay.cpp
mythtv/libs/libmythui/mythuiwebbrowser.cpp
mythtv/libs/libmythui/mythuiwebbrowser.h
mythtv/programs/mythbackend/config_backend_general.xml
mythtv/programs/mythbackend/filetransfer.cpp
mythtv/programs/mythbackend/housekeeper.cpp
mythtv/programs/mythbackend/services/myth.cpp
mythtv/programs/mythbackend/services/myth.h
mythtv/programs/mythfrontend/main.cpp
mythtv/programs/mythtv-setup/backendsettings.cpp
mythtv/settings.pro

_______________________________________________
mythtv-firehose mailing list
mythtv-firehose@mythtv.org
http://www.mythtv.org/mailman/listinfo/mythtv-firehose