summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-30 19:30:31 +0000
committerCarl Hetherington <cth@carlh.net>2014-10-30 19:30:31 +0000
commitfec5dfc39cd4239269ed0a6c9ef9f959edaf3c94 (patch)
tree852dca73f35c6c448be71a6d3b158b24344490f5 /ChangeLog
parent8fd24ef30471043e0ceb9f8553c69278e3f1ff51 (diff)
Fix mis-merge.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bf835bbf6..d96a2dcd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-30 Carl Hetherington <cth@carlh.net>
+
+ * Fix mis-merge causing complete breakage
+ of the main window.
+
2014-10-28 Carl Hetherington <cth@carlh.net>
* Version 2.0.18 released.