Merge master.
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Sep 2014 19:48:04 +0000 (20:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 11 Sep 2014 19:48:04 +0000 (20:48 +0100)
commit7979aeb87a83de31c4cf25f88eef4fbca4b56553
tree08ad0d379ab925795403902b79c1b6a6bebb165f
parent02cdeb8663b9819373680efd0d867373258d51f7
parenta8f51733f93bcf88d867d5a4b359e6e14ddad91a
Merge master.
ChangeLog
src/wx/dcp_panel.cc
src/wx/film_editor.h