Merge branch '1.0' into 1.0-seek

author Carl Hetherington <cth@carlh.net>

Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)

committer Carl Hetherington <cth@carlh.net>

Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
author Carl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
committer Carl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
diff --cc src/lib/player.cc
Simple merge
diff --cc src/wx/video_panel.cc
Simple merge
author	Carl Hetherington <cth@carlh.net>
	Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
committer	Carl Hetherington <cth@carlh.net>
	Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
		1	2
src/lib/player.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/wx/video_panel.cc	patch \|	diff1 \|	diff2 \|	blob \| history