Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
authorCarl Hetherington <cth@carlh.net>
Tue, 21 Jul 2015 23:15:29 +0000 (00:15 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 Jul 2015 23:15:29 +0000 (00:15 +0100)
1  2 
ChangeLog

diff --cc ChangeLog
index 79453fc4c972522d81d301564ab2bb3bef1cabfc,ba96eb7321553ccddeb9142e2545d6f30a42387d..60f49027b1ba83bdd51cb955238d4f590a0b9d31
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2015-07-22  Carl Hetherington  <cth@carlh.net>
 +
 +      * Use NR for rating an in ISDCF name if none is specified.
 +
+ 2015-07-21  Carl Hetherington  <cth@carlh.net>
+       * Version 2.1.27 released.
  2015-07-21  Carl Hetherington  <cth@carlh.net>
  
        * Fix incorrect conversion of audio from DCP sources (#642).