Merge branch 'master' into 2.0
authorCarl Hetherington <cth@carlh.net>
Wed, 26 Feb 2014 11:58:37 +0000 (11:58 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 26 Feb 2014 11:58:37 +0000 (11:58 +0000)
1  2 
src/wx/audio_plot.cc

Simple merge