Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework...

author Carl Hetherington <cth@carlh.net>

Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)

committer Carl Hetherington <cth@carlh.net>

Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
author Carl Hetherington <cth@carlh.net>
Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
committer Carl Hetherington <cth@carlh.net>
Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
diff --cc src/lib/encoder.cc
Simple merge
diff --cc src/lib/job.cc
Simple merge
diff --cc src/lib/player.h
Simple merge
author	Carl Hetherington <cth@carlh.net>
	Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
committer	Carl Hetherington <cth@carlh.net>
	Sat, 13 Apr 2013 23:48:34 +0000 (00:48 +0100)
		1	2
src/lib/encoder.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/job.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/player.h	patch \|	diff1 \|	diff2 \|	blob \| history