Merge master.
[dcpomatic.git] / src / wx / alignment.cc
2012-07-24 Carl HetheringtonJust move gtk -> wx (part deux)