Merge Carsten's de_DE translation from c52231e.

[dcpomatic.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e2da549d1ec19360fb6030943ee169a6e4f07665..da3701f14fddc3d4f2e1154ac2e18cf6c5567772 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,22 @@
-<<<<<<< HEAD
-2018-03-14  Carl Hetherington  <cth@carlh.net>
-=======
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Updated de_DE translation from Carsten Kurz.
+
+       * Version 2.12.1 released.
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.12.0 released.
+
+2018-03-22  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.11.79 released.
+
 2018-03-21  Carl Hetherington  <cth@carlh.net>
 
        * Updated nl_NL translation from Rob van Nieuwkerk.
 
 2018-03-19  Carl Hetherington  <cth@carlh.net>
->>>>>>> 15f3ff4... Updated nl_NL translation from Rob van Nieuwkerk.
 
        * Better error when loading a non-certificate as a certificate.