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 7002c19cfa98e1f0e2afd7273139f3a73cad1673..a671a9e8dd38df8a602e17b626ab8b705cbb2b66 100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,4
+1,8
@@
+<<<<<<< HEAD
+dcpomatic (2.0.4-1) UNRELEASED; urgency=low
+=======
dcpomatic (1.73.0-1) UNRELEASED; urgency=low
dcpomatic (1.73.0-1) UNRELEASED; urgency=low
+>>>>>>> origin/master
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
@@
-174,10
+178,8
@@
dcpomatic (1.73.0-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
- * New upstream release.
- * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory>
Tue, 26 Aug 2014 21:47:56
+0100
+ -- 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