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)
commite8c1880a2b9a40eb11ee259feee3edd799139a43
treeb229f71d8ce191710b5787b9061953b22a5ce88d
parent58588c485eac7c488a574fe923576f109ec0134e
parente52d78a0ebf4852c56bcf4119ed7d4c1d0d9b8ff
Merge branch 'master' into 2.0
src/wx/audio_plot.cc