Fix rebase onto master.
authorCarl Hetherington <cth@carlh.net>
Mon, 25 Apr 2016 20:43:25 +0000 (21:43 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 May 2016 10:50:29 +0000 (11:50 +0100)
commit0a2d40420813403a96352c6dc895d23fcd9994c0
tree44f707f5bed1b062e45b2d5caf04fcfac7896539
parent8008b81c0ccee843263e2a648707b71cc3ae081f
Fix rebase onto master.
src/wx/audio_dialog.cc
src/wx/audio_dialog.h
src/wx/timeline.cc