Fix merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 29 Jun 2015 14:07:17 +0000 (15:07 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 29 Jun 2015 14:07:17 +0000 (15:07 +0100)
commit318a778b1b5c98b79b202dc953ff2ac131371a1b
tree52d05d9927c22842c5047a625e07eb9c92f87cdb
parent3802ba3df2ac27d4fabdcbd61b9ed84f6adf5627
parentb289602176a4943233cffb75e8ccac379112420a
Fix merge.
ChangeLog
src/wx/subtitle_panel.cc