Merge master.
authorCarl Hetherington <cth@carlh.net>
Sun, 31 Aug 2014 16:31:38 +0000 (17:31 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 31 Aug 2014 16:31:38 +0000 (17:31 +0100)
commit22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5
tree7c2dea8be25068bbc17474c14a3fba5413b8f20b
parent2d24bc7aaed800415bce4fffe06f261d5e9e464a
parent3c7e1840081639ea5dc537c94baa13972a1987fd
Merge master.
ChangeLog
src/wx/about_dialog.cc
src/wx/content_panel.cc
src/wx/content_panel.h
src/wx/editable_list.h