Merge master.
authorCarl Hetherington <cth@carlh.net>
Mon, 30 Jun 2014 12:57:52 +0000 (13:57 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 30 Jun 2014 12:57:52 +0000 (13:57 +0100)
commit74fe68e5895654e27a7cf8097917c1e95fa89519
tree8afd88ce9f43293798dfb8018d024adac09388c2
parent3c2a72e6e1d4fa47490155a0d6f5e9c5a3a17f68
parent7d93aa13507094e87bc9086986b36edd96a613b0
Merge master.
ChangeLog
src/lib/playlist.cc
src/wx/film_editor.cc
src/wx/wscript