projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
969064d
)
Bump libdcp to fix erroneous addition of referenced assets to PKLs (#723).
author
Carl Hetherington
<cth@carlh.net>
Wed, 28 Oct 2015 10:26:19 +0000
(10:26 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 28 Oct 2015 10:26:19 +0000
(10:26 +0000)
ChangeLog
patch
|
blob
|
history
cscript
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 316f4befaf305bda6a562ed5b18ad2c907211812..a84a8f6aafa22cbc9566777034f28b6472b6c6a6 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,7
@@
+2015-10-28 Carl Hetherington <cth@carlh.net>
+
+ * Fix erroneous addition of referenced assets to PKLs (#723).
+
2015-10-19 Carl Hetherington <cth@carlh.net>
* Draw reels in the timeline.
diff --git
a/cscript
b/cscript
index 16696b5342b40caea916a79e6e7f9f64938c54c1..7caef1c550c0c823c91e76ddbd6ef134f709217a 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-257,8
+257,8
@@
def dependencies(target):
ffmpeg_options = {}
return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
- ('libdcp', '
f6b7898
'),
- ('libsub', '
afc7eec
'))
+ ('libdcp', '
6dc0cdb
'),
+ ('libsub', '
f3505c1
'))
def configure_options(target):
opt = ''