From: Carl Hetherington <cth@carlh.net>
Date: Wed, 6 Jan 2016 11:06:37 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.6.11~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c55877926307d7018942beb5fd65a39f278e05de

Merge.
---

c55877926307d7018942beb5fd65a39f278e05de
diff --cc ChangeLog
index 539bef467,fef8bbf74..487f8de6d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,23 +1,27 @@@
 +2016-01-06  c.hetherington  <cth@carlh.net>
 +
 +	* New sk_SK translation from Tomáš Hlaváč.
 +
+ 2015-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Add basic search function to KDM creator screens list (#739).
+ 
+ 	* Version 2.6.10 released.
+ 
+ 2015-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Updated nl_NL translation from Rob van Nieuwkerk.
+ 
+ 	* Version 2.6.9 released.
+ 
+ 2015-12-23  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Add stored list of DKDMs to KDM creator (#767).
+ 
+ 2015-12-22  Carl Hetherington  <cth@carlh.net>
+ 
+ 	* Fix hang when removing screens in some cases.
+ 
  2015-12-21  Carl Hetherington  <cth@carlh.net>
  
  	* Version 2.6.8 released.