projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bb070db1b36020058b010057b08ae78e6243d2d0 from master.
[dcpomatic.git]
/
ChangeLog
diff --git
a/ChangeLog
b/ChangeLog
index 5d0338bc2d4070abc45bf7397fbbc767d92f822e..ba9012f0fd59756cf0def5437af6cfe7735e2b98 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,5
+1,8
@@
2015-04-12 Carl Hetherington <cth@carlh.net>
2015-04-12 Carl Hetherington <cth@carlh.net>
+ * Hand-apply c0e0b90d987af2586323d4a67bd67330256da51d from master;
+ remove 1.37 ratio and set Academy to 1.375.
+
* Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
ellipsize filters strings if it is long.
* Hand-apply 83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb from master;
ellipsize filters strings if it is long.