Fix rebase onto master.
authorCarl Hetherington <cth@carlh.net>
Sat, 16 Apr 2016 00:19:38 +0000 (01:19 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 May 2016 10:50:29 +0000 (11:50 +0100)
commit8008b81c0ccee843263e2a648707b71cc3ae081f
treec91a8fa3363645ed39dccf1bc8c5bd944e7b80a3
parent8109f84306e024cbbe3e386db178ce00f0a32401
Fix rebase onto master.
src/lib/audio_content.cc
src/lib/audio_content.h
src/lib/sndfile_content.cc
src/wx/audio_panel.cc
src/wx/timing_panel.cc