Merge remote-tracking branch 'origin/master' into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 16:02:25 +0000 (17:02 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 16:02:25 +0000 (17:02 +0100)
commit1f82930e73679d6aec5223caa255f564339a1a2a
treef65a262629f6f0fbe357efe6aded5f799bb7b757
parentfc56dc97103d00437843a31e1ef0c4915900ad1a
parent5c6191a5a154e60ae8a1be8b09372be183c1a520
Merge remote-tracking branch 'origin/master' into 1.0
ChangeLog
src/lib/config.cc
src/lib/config.h
src/lib/video_content.cc
src/wx/config_dialog.cc