projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix mis-merge.
[dcpomatic.git]
/
ChangeLog
diff --git
a/ChangeLog
b/ChangeLog
index bf835bbf6fbde2f835a1f20b5d114a1cb82ac198..d96a2dcd731a398f47cef29105b0e5ca20bb7997 100644
(file)
--- 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.