Merge.

diff --cc ChangeLog
index 539bef4670f90a0acbd36d6a35f23ab92419abd3,fef8bbf740a87e0db77e7359f9966b4d8518b8c0..487f8de6deaa816d050840b5f419bf507cb6a219
--- 1/ChangeLog
--- 2/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.

diff --cc cscript
Simple merge

diff --cc src/wx/about_dialog.cc
Simple merge