[mythtv-firehose] mythtv branch devel/ceton updated by danielk. v0.26-pre-859-gcff550c

[Git Repo Owner]

The branch, devel/ceton has been updated on the
mythtv repository by gitolite user danielk.
       via  cff550c4b18a8966458cdf9416f2e4a01fa2d33a (commit)
       via  0998b7ae567eaac0db87fc74b0852a4e4ac1fc4d (commit)
       via  9d3bc8dcf0018092019b27e0d99156b7df6e017f (commit)
       via  dda4a4fa747b8323ba677f876dd75ea619073035 (commit)
       via  6b444ad32ecf1cfdbf80fb7c9a2c93593aa3c3d1 (commit)
       via  4957e215a8387896e4108a49c823e54ea3e5a682 (commit)
       via  5e986097e1aba0ff8157e75a771ec718a8805421 (commit)
       via  99f949eb4c33f00f5b44a189d719334b22ed82e8 (commit)
       via  fe00ebc8715f6e3296d222e1df04917428aa95ce (commit)
       via  31ea20d424de0cb898f0aa7ffb9b7120c8be2b3f (commit)
       via  85e8db231d35411cebfce994b16c2ebbd033b2e3 (commit)
       via  61163ba90178fcdec55bb6ab0a1c3992e3c199df (commit)
       via  b6d65fcce17031cb729b6f68c1edabcfd5f11670 (commit)
       via  aa93d3f6194020fa9e9d2b6e4b4e52d892fe8575 (commit)
       via  e9a7a132f846df25c6c171255218794d798b911a (commit)
       via  d92b6d4543bdf173a7f8714c23ea92786e6a7e93 (commit)
       via  d553247877aad709257f684a792f26133c12729c (commit)
       via  b5718743b36447213abb005401ac9df8e24e652c (commit)
       via  aad4f63582397ceae4206d1aaf5eac2ded5b1a13 (commit)
       via  7aea3131a8801c09617012d3e892ec4fa68f626a (commit)
       via  c53542f4a2410591972f394944d6e97fbe6d7671 (commit)
       via  2e800530b51da3d59bcbcc4bb5fcdb73708244aa (commit)
       via  de2eef39d5334f510ceeb61acb954f9c0382d3b9 (commit)
       via  86eee5ef0ae45b0eb7f4b35db90de705bd5374ad (commit)
       via  6f4f87bf554819e3090c749f91c5c0266e628209 (commit)
       via  ed0212883168ec2dc2d3bc532ef40530da0b180d (commit)
       via  4b07742e8af6f18e1b353f1f866211e9331f4c4b (commit)
       via  c2883d035eb06ae0bdd054fe933c716ccd6edcfb (commit)
       via  f21c868e241bdf83583d8b6b19dc7842abc84a29 (commit)
      from  b9023dae2f05712281648936357e9e5ab2203cdb (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 cff550c4b18a8966458cdf9416f2e4a01fa2d33a
Author:    Daniel Thor Kristjansson <danielk at cuymedia.net> at Mon, 2 Jul 2012 18:22:02 -0400
Committer: Daniel Thor Kristjansson <danielk at cuymedia.net> at Mon, 2 Jul 2012 18:22:02 -0400
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=cff550c4b18a8966458cdf9416f2e4a01fa2d33a

Merge branch 'master' into devel/ceton



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

Summary of changes:
 mythplugins/mythgallery/mythgallery/thumbview.cpp |   23 +--
 mythplugins/mythgallery/mythgallery/thumbview.h   |    3 +
 mythplugins/mythgame/mythgame/gamesettings.cpp    |   34 ++++-
 mythplugins/mythgame/mythgame/gamesettings.h      |   29 ++--
 mythplugins/mythgame/mythgame/gameui.cpp          |    4 +-
 mythtv/external/Makefile                          |    4 +-
 mythtv/external/nzmqt/src/nzmqt.pro               |    2 +-
 mythtv/external/qjson/src/src.pro                 |    6 +-
 mythtv/libs/libmythbase/logging.cpp               |  187 +++++++++------------
 mythtv/libs/libmythbase/logging.h                 |    6 +-
 mythtv/libs/libmythbase/loggingserver.cpp         |  125 ++++++++------
 mythtv/libs/libmythbase/loggingserver.h           |    2 +-
 mythtv/libs/libmythbase/mthreadpool.cpp           |    4 +-
 mythtv/libs/libmythtv/mpeg/mpegtables.h           |    8 +-
 mythtv/libs/libmythtv/ringbuffer.cpp              |    2 +-
 mythtv/programs/mythbackend/autoexpire.cpp        |    5 +-
 mythtv/programs/mythbackend/filetransfer.h        |    2 -
 mythtv/programs/mythbackend/httpstatus.cpp        |   11 +-
 mythtv/programs/mythlogserver/main.cpp            |   15 ++-
 mythtv/programs/mythtranscode/transcode.cpp       |  153 +++++++-----------
 mythtv/programs/mythtv-setup/importicons.cpp      |   24 ++-
 21 files changed, 330 insertions(+), 319 deletions(-)
 mode change 100644 => 100755 mythtv/programs/mythtranscode/transcode.cpp

--