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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-05-11T09:36:25-07:00
   Push Date:  2011/05/11 09:46:23 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  a96fb499888c6f8b617be0d0b183e9d0669d4479
   Changeset:  https://github.com/MythTV/mythtv/commit/a96fb4998

Log:

Merge commit 'b7b6b11'

Conflicts:
	mythtv/programs/mythbackend/mainserver.cpp
	mythtv/programs/mythbackend/mainserver.h

Added:

   mythtv/i18n/mythfrontend_hr.qm
   mythtv/i18n/mythfrontend_hr.ts

Modified:

   mythplugins/mytharchive/mytharchive/thumbfinder.cpp
   mythplugins/mytharchive/mytharchivehelper/main.cpp
   mythplugins/mythmusic/mythmusic/avfdecoder.cpp
   mythplugins/mythmusic/mythmusic/goom/zoom_filter_mmx.c
   mythplugins/mythmusic/mythmusic/metaioavfcomment.cpp
   mythtv/configure
   mythtv/filters/greedyhdeint/color.c
   mythtv/filters/linearblend/filter_linearblend.c
   mythtv/i18n/i18n.pro
   mythtv/i18n/translate.pro
   mythtv/libs/libmyth/audio/audiooutputbase.cpp
   mythtv/libs/libmyth/audio/audiooutputbase.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/livetvchain.cpp
   mythtv/libs/libmythtv/osdchromakey.cpp
   mythtv/libs/libmythtv/yuv2rgb.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp