Merge.

1 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c25e5a2dc..0806da963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-06-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.95 released.
+
+2013-06-05  Carl Hetherington  <cth@carlh.net>
+
+	* Fix crash on startup on Windows
+
+2013-06-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.94 released.
+
+2013-06-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.94beta2 released.
+
+2013-06-04  Carl Hetherington  <cth@carlh.net>
+
+	* A few fixes to A/B mode.
+
 2013-05-31  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.94beta1 released.