From: Carl Hetherington <cth@carlh.net>
Date: Thu, 7 Jan 2016 15:17:31 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.6.14~8
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=52b9a5f3edb119c19ce49c6885a7f3733d11f2e8

Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
---

52b9a5f3edb119c19ce49c6885a7f3733d11f2e8
diff --cc ChangeLog
index 1988607a5,0bd19e906..7c414cec2
--- a/ChangeLog
+++ 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.