projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
ChangeLog
diff --git
a/ChangeLog
b/ChangeLog
index 6eb3bcff0e2ddb5daad595f67bab968a52bb951b..b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,11
@@
+2014-03-07 Carl Hetherington <cth@carlh.net>
+
+ * Add subtitle view.
+
+2014-05-05 Carl Hetherington <cth@carlh.net>
+
+ * Version 1.69.0 released.
+
2014-05-02 Carl Hetherington <cth@carlh.net>
* Version 1.68.0 released.
2014-05-02 Carl Hetherington <cth@carlh.net>
* Version 1.68.0 released.
@@
-117,6
+125,7
@@
* Another attempt to fix colour conversion dialog strange behaviour
on OS X.
* Another attempt to fix colour conversion dialog strange behaviour
on OS X.
+>>>>>>> master
2014-03-18 Carl Hetherington <cth@carlh.net>
2014-03-18 Carl Hetherington <cth@carlh.net>