Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:55:53 +0000 (00:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:55:53 +0000 (00:55 +0000)
commita6b7ff4fc0ad2d05a7b9a9c56c0e0ec60ec44a4c
tree6a79eb71f337ade25e90cdf40b9b3f93bb2724a8
parent2e504b33eb9f38cac629ad31b7c107fb0cf5efda
Merge master.
src/lib/player.cc
src/lib/video_content.cc
src/wx/config_dialog.cc