Mailing List Archive

Author: Daniel Kristjansson <danielk@cuymedia.net>
Change Date: 2011-05-11T09:45:17-07:00
Push Date: 2011/05/11 09:46:23 -0700
Repository: mythtv
Branch: mythtv-rec2
New Revision: e2bc612ffc4e062a47e0fc010af204c724680dcf
Changeset: https://github.com/MythTV/mythtv/commit/e2bc612ff

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
mythtv/libs/libmythtv/NuppelVideoRecorder.h
mythtv/libs/libmythtv/ThreadedFileWriter.cpp
mythtv/libs/libmythtv/ThreadedFileWriter.h
mythtv/libs/libmythtv/firewirerecorder.cpp
mythtv/libs/libmythtv/hdhrrecorder.cpp
mythtv/libs/libmythtv/iptvrecorder.cpp
mythtv/libs/libmythtv/iptvrecorder.h
mythtv/libs/libmythtv/recorderbase.cpp
mythtv/libs/libmythtv/recorderbase.h
mythtv/programs/mythbackend/scheduler.cpp

Modified:

mythtv/libs/libmythtv/fifowriter.h

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