Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
authorCarl Hetherington <cth@carlh.net>
Thu, 7 Jan 2016 15:17:31 +0000 (15:17 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 7 Jan 2016 15:17:31 +0000 (15:17 +0000)
1  2 
ChangeLog

diff --cc ChangeLog
index 1988607a5e5a333025b414fd66f5722ecdace5c0,0bd19e90638211acc774d22c4a6d9ee9a77b6236..7c414cec24620f35268c1aa8eba8bc7ae5ef09e0
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2016-01-07  c.hetherington  <cth@carlh.net>
 +
 +      * Sort image files added using "Add file(s)..." alphabetically
 +      rather than trying to find numbers in the filenames.
 +
+ 2016-01-07  Carl Hetherington  <cth@carlh.net>
+       * Version 2.6.13 released.
  2016-01-07  Carl Hetherington  <cth@carlh.net>
  
        * Version 2.6.12 released.