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]
/
debian
/
changelog
diff --git
a/debian/changelog
b/debian/changelog
index 1da8a1f91707c709a48beaa08630d3c38924a409..99cdc4f584e257115a9bf41656bfbcdd3a4f69b8 100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,4
+1,4
@@
-dcpomatic (2.0.
1
-1) UNRELEASED; urgency=low
+dcpomatic (2.0.
4
-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
@@
-171,15
+171,11
@@
dcpomatic (2.0.1-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
-<<<<<<< HEAD
-
- -- Carl Hetherington <carl@dalglish> Wed, 06 Aug 2014 18:59:35 +0100
-=======
+ * New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Sat, 09 Aug 2014 12:38:18 +0100
->>>>>>> origin/master
+ -- Carl Hetherington <carl@d1stkfactory> Fri, 29 Aug 2014 19:04:40 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
dcpomatic (0.87-1) UNRELEASED; urgency=low