[mythtv-commits] mythtv branch devel/ceton updated by danielk. v0.26-pre-1117-g0d0f8c9

Git Repo Owner noreply at mythtv.org
Tue Jul 31 18:54:04 UTC 2012


The branch, devel/ceton has been updated on the
mythtv repository by gitolite user danielk.
       via  0d0f8c9baba277568be1755024ad012dae9ba082 (commit)
       via  a9f18c63bfb23494ee83a8ba76d82fc320617067 (commit)
       via  8bc61935096a1bd5c0cc8bbe0000eeea72745e4a (commit)
       via  9b8a005c0b5df7378d6db4c54a8cfdd3277fe0c1 (commit)
       via  db9ef08a48f1d200341e0434c3886df61b922cf7 (commit)
       via  7b0df34ec5b43391cbb92b6da3552301033b78f6 (commit)
       via  5cc6d1c19ebaf00dfb17d655c5c6da02af5faf7c (commit)
       via  a7f980fac3e37f67351955d7686920478c52e925 (commit)
       via  71ca47f81d004124d58049ae40039e5f31252fea (commit)
       via  2961d1ffddbc7877e8d55f60a28a66fce0328011 (commit)
       via  1a14842ed8bce7c37602ffb83663e57df471fca4 (commit)
       via  cec08db97598a3ab049d7a92b1ec28842d199179 (commit)
       via  e9bc43d0dd58065e1e8555d15820908d77cda720 (commit)
       via  661a1ddd71cfe5b24df72cd4585749a43af2f103 (commit)
       via  0e5d159c6bc98ef29a7b6bb225b43492b45c37ac (commit)
       via  63c044216d52a36522151ce2072b2e6b07e8b7f5 (commit)
       via  16231c959b2edbef011636e3c8df6e66933899e9 (commit)
       via  ecc1525d83abfed452e3b5f983de7c593063af91 (commit)
       via  e8073bc0e9cbd3aaaaff85d6ca4ef12c79bf71d2 (commit)
       via  94f1eff2c39e3f642ae63a6b456c628696c8f5bf (commit)
       via  922b1d2be8175e7a83af7cb7de930ece7d6df4a4 (commit)
       via  4f6c08bfbfe8a933aefce7e270bd3443a308ccba (commit)
       via  fa54d5d957598f7f8f0d093079208231c9732a34 (commit)
       via  da749c4de2fbea4675b1b0b3a88ef2643289c907 (commit)
       via  f9a46e0683ad9cf7fe04a9c523247dbe48105bae (commit)
       via  f3fb6f066ef12d470695c6934a023e26a557c6bb (commit)
       via  292323d67a2aa9980a79e8c74f090b9735029b36 (commit)
       via  52392963b380173f1e4343036f6814bd59a2f0af (commit)
       via  980be9f588b20a3dfe12d9e1b4a04d753c9921c4 (commit)
       via  beeeebb392d2521906bbb825a38640323179524d (commit)
       via  262c7c7ab640a3f1af515c45b4040723ec76e6a6 (commit)
       via  60cf735196cf267226dd8f7ec937a82fb5f8d4b3 (commit)
       via  04715f641349e8da25c8232efa6867e17b0be3fa (commit)
       via  e4f928837fcbbdb5112fa76cd7c4a6d83da56c4c (commit)
       via  7593192d066a75ee9f55887bc8880dc35dc5b285 (commit)
      from  dc09143852e560266e8454ed9854705c87f330b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d0f8c9baba277568be1755024ad012dae9ba082
Author:    Daniel Thor Kristjansson <danielk at cuymedia.net> at Tue, 31 Jul 2012 14:33:42 -0400
Committer: Daniel Thor Kristjansson <danielk at cuymedia.net> at Tue, 31 Jul 2012 14:33:42 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=0d0f8c9baba277568be1755024ad012dae9ba082

Merge branch 'master' into devel/ceton
Conflicts:
	mythtv/libs/libmythtv/cetonrtp.cpp
	mythtv/libs/libmythtv/recorders/dtvrecorder.h



-----------------------------------------------------------------------

Summary of changes:
 mythplugins/mytharchive/i18n/mytharchive_zh_hk.qm  |  Bin 23402 -> 23786 bytes
 mythplugins/mytharchive/i18n/mytharchive_zh_hk.ts  |  262 +-
 .../mythgallery/mythgallery/galleryfilterdlg.cpp   |   36 +-
 mythplugins/mythgallery/mythgallery/iconview.cpp   |    2 +-
 mythplugins/mythgallery/mythgallery/thumbview.cpp  |    8 +-
 mythplugins/mythgame/mythgame/gameui.cpp           |    6 +-
 mythplugins/mythmusic/mythmusic/musiccommon.cpp    |    8 +-
 .../mythmusic/mythmusic/playlisteditorview.cpp     |    5 +-
 mythplugins/mythmusic/mythmusic/smartplaylist.cpp  |    5 +-
 .../mythnetvision/mythnetvision/nettree.cpp        |    8 +-
 .../scripts/uk_metoffice/metoffice_threehourapi.pl |    7 +
 .../mythweather/mythweather/weatherSetup.cpp       |    5 +-
 mythtv/filters/filters.pro                         |    1 +
 mythtv/filters/vflip/filter_vflip.c                |  153 +
 mythtv/filters/vflip/vflip.pro                     |    8 +
 mythtv/i18n/mythfrontend_zh_hk.qm                  |  Bin 415396 -> 433408 bytes
 mythtv/i18n/mythfrontend_zh_hk.ts                  |13506 ++++++++++----------
 mythtv/libs/libmyth/mythdialogs.cpp                |    7 +-
 mythtv/libs/libmythbase/logging.cpp                |    5 +-
 mythtv/libs/libmythbase/mythcorecontext.h          |    2 +
 mythtv/libs/libmythbase/mythversion.h              |    2 +-
 mythtv/libs/libmythbase/referencecounter.cpp       |   77 +-
 mythtv/libs/libmythbase/referencecounter.h         |    8 +-
 mythtv/libs/libmythbase/signalhandling.cpp         |   84 +-
 mythtv/libs/libmythbase/signalhandling.h           |   15 +-
 .../libs/libmythtv/AirPlay/mythairplayserver.cpp   |    2 +-
 mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp |   50 +-
 mythtv/libs/libmythtv/HLS/httplivestreambuffer.h   |    3 +
 mythtv/libs/libmythtv/avformatdecoder.cpp          |   56 +-
 .../libs/libmythtv/channelscan/channelimporter.cpp |    2 +-
 .../libs/libmythtv/channelscan/channelscanner.cpp  |    4 +-
 mythtv/libs/libmythtv/commbreakmap.cpp             |    4 +-
 mythtv/libs/libmythtv/dbchannelinfo.cpp            |   17 +-
 mythtv/libs/libmythtv/dbchannelinfo.h              |    2 +-
 mythtv/libs/libmythtv/decoderbase.cpp              |    1 +
 mythtv/libs/libmythtv/decoderbase.h                |    2 +
 mythtv/libs/libmythtv/dtvmultiplex.cpp             |   14 +-
 mythtv/libs/libmythtv/eitscanner.cpp               |   10 +-
 mythtv/libs/libmythtv/iptv/iptvfeederhls.cpp       |   11 +
 mythtv/libs/libmythtv/jobqueue.cpp                 |   15 +-
 mythtv/libs/libmythtv/mythplayer.cpp               |   15 +-
 mythtv/libs/libmythtv/previewgeneratorqueue.cpp    |    1 +
 mythtv/libs/libmythtv/profilegroup.cpp             |    2 +-
 .../libs/libmythtv/recorders/firewirerecorder.cpp  |    1 +
 mythtv/libs/libmythtv/recorders/mpegrecorder.cpp   |    6 -
 mythtv/libs/libmythtv/recorders/mpegrecorder.h     |    1 -
 mythtv/libs/libmythtv/recordingprofile.cpp         |    4 +-
 mythtv/libs/libmythtv/tv_play.cpp                  |   25 +-
 mythtv/libs/libmythtv/tv_rec.cpp                   |   94 +-
 mythtv/libs/libmythtv/tv_rec.h                     |    1 +
 mythtv/libs/libmythtv/util-xv.cpp                  |   33 +-
 mythtv/libs/libmythtv/videoout_vdpau.cpp           |   10 +
 mythtv/libs/libmythtv/videoout_vdpau.h             |    1 +
 mythtv/libs/libmythtv/videooutbase.h               |    3 +
 mythtv/libs/libmythui/mythrender_vdpau.cpp         |   21 +-
 mythtv/libs/libmythui/mythrender_vdpau.h           |    2 +
 mythtv/libs/libmythui/myththemedmenu.cpp           |   13 +-
 mythtv/libs/libmythui/myththemedmenu.h             |    5 +-
 mythtv/programs/mythavtest/main.cpp                |   14 +
 mythtv/programs/mythbackend/main.cpp               |    2 +-
 mythtv/programs/mythbackend/main_helpers.cpp       |    5 +-
 mythtv/programs/mythccextractor/main.cpp           |    3 +-
 mythtv/programs/mythcommflag/main.cpp              |    4 +-
 mythtv/programs/mythfilldatabase/filldata.cpp      |   12 +-
 mythtv/programs/mythfilldatabase/main.cpp          |    4 +-
 mythtv/programs/mythfrontend/editvideometadata.cpp |    2 +-
 mythtv/programs/mythfrontend/globalsettings.cpp    |   15 +-
 mythtv/programs/mythfrontend/main.cpp              |    8 +-
 mythtv/programs/mythfrontend/progdetails.cpp       |    2 +-
 .../programs/mythfrontend/programrecpriority.cpp   |    4 +-
 mythtv/programs/mythfrontend/statusbox.cpp         |    8 +-
 mythtv/programs/mythfrontend/videodlg.cpp          |    6 +-
 mythtv/programs/mythfrontend/videofilter.cpp       |    3 +-
 mythtv/programs/mythfrontend/viewscheduled.cpp     |    7 +-
 mythtv/programs/mythjobqueue/main.cpp              |    4 +-
 mythtv/programs/mythlcdserver/main.cpp             |    6 +-
 mythtv/programs/mythlogserver/main.cpp             |    6 +-
 mythtv/programs/mythmediaserver/main.cpp           |    4 +-
 mythtv/programs/mythmetadatalookup/main.cpp        |    4 +-
 mythtv/programs/mythpreviewgen/main.cpp            |    3 +-
 mythtv/programs/mythshutdown/main.cpp              |    5 +-
 mythtv/programs/mythtranscode/main.cpp             |    8 +-
 mythtv/programs/mythtv-setup/importicons.cpp       |    8 +-
 mythtv/programs/mythtv-setup/main.cpp              |    4 +-
 mythtv/programs/mythutil/main.cpp                  |    4 +-
 mythtv/programs/mythwelcome/main.cpp               |   11 +-
 .../MythCenter-wide/fonts/DroidSans-Bold.ttf       |  Bin 191032 -> 0 bytes
 mythtv/themes/MythCenter-wide/fonts/DroidSans.ttf  |  Bin 190044 -> 0 bytes
 mythtv/themes/MythCenter-wide/fonts/LICENSE        |  202 -
 mythtv/themes/defaultmenu/mainmenu.xml             |    1 +
 90 files changed, 7466 insertions(+), 7554 deletions(-)
 create mode 100644 mythtv/filters/vflip/filter_vflip.c
 create mode 100644 mythtv/filters/vflip/vflip.pro
 delete mode 100644 mythtv/themes/MythCenter-wide/fonts/DroidSans-Bold.ttf
 delete mode 100644 mythtv/themes/MythCenter-wide/fonts/DroidSans.ttf
 delete mode 100644 mythtv/themes/MythCenter-wide/fonts/LICENSE

-- 



More information about the mythtv-commits mailing list