Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption...
[dcpomatic.git] / src / wx / preset_colour_conversion_dialog.h
2013-09-17 Carl HetheringtonMerge 1.0 in.
2013-08-17 Carl HetheringtonVarious bits mostly related to colour conversions.