Hand-apply bd7102b476c631b1fa9067f18ce938d86073f6c8; single-file hashes.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 66c0a64e1685dc71a28d6fd14f2c7b8bfbcc61e1..05a1738a0389031152b2e01dc3bb3d7da1782a91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2015-04-20  Carl Hetherington  <cth@carlh.net>
+
+       * Hand-apply 47770097cf6a5d7dbbdded8977da5f3de53dfd33;
+       single-file hashes.
+
+       * Hand-apply e1d0d24146592e311d46781a1961fe080f6357cf;
+       attempt to fix confusion with the JPEG2000 bandwidth
+       control when a user enters a value directly rather than
+       using the spin arrows.
+
+2015-04-16  Carl Hetherington  <cth@carlh.net>
+
+       * Fix potential OS X crashes due to another incarnation
+       of the bizarre multi-thread stringstream bug.
+
+2015-04-15  c.hetherington  <cth@carlh.net>
+
+       * Hand-apply 94998e12d117f3f1781dfb1318939debfbf34546 from master;
+       add option to restore the default configuration.
+
 2015-04-12  Carl Hetherington  <cth@carlh.net>
 
        * Hand-apply 69866d9ba972d21375081c313ac245535ac55be9 from master;