projects / dcpomatic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6bcf76c 2856828)
Fix merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 23:54:09 +0000 (00:54 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 27 Jun 2014 23:54:09 +0000 (00:54 +0100)
1  2 
debian/changelog patch | diff1 | diff2 | blob | history

diff --combined debian/changelog
index 17f8b311a3147aa49f4206ff2c8bdc68712aa0b4,b69567a2d853623a235a0397c343012eb8f38bc2..6538c05ecd542e2ff5e901461200044457662129
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- dcpomatic (1.71.0-1) UNRELEASED; urgency=low
+ dcpomatic (1.71.1-1) UNRELEASED; urgency=low
  
    * New upstream release.
    * New upstream release.
@@@ -164,7 -164,9 +164,7 @@@
    * New upstream release.
    * New upstream release.
  
 -<<<<<<< HEAD  * New upstream release.
 -
 - -- Carl Hetherington <carl@d1stkfactory>  Sat, 28 Jun 2014 00:53:18 +0100
 + -- Carl Hetherington <carl@d1stkfactory>  Thu, 26 Jun 2014 19:30:39 +0100
  
  dcpomatic (0.87-1) UNRELEASED; urgency=low
  
2.0 development branch of dcpomatic