summaryrefslogtreecommitdiffstats
path: root/debian/changelog
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-01-11 15:58:10 +0100
committerDidier Raboud <odyx@debian.org>2013-01-11 15:59:27 +0100
commit8daf3c25d6d521f3829b220b73bbe2257bda9aef (patch)
treee0edfec8fd2a093274cb00aa5d9dd3bb23ffeccd /debian/changelog
parentbcb1b7ca230c7c7be3fc7be152187b95cbe64942 (diff)
parent35faf628cf8085a9262c2b89999cacdd3f5bee79 (diff)
downloadcolobot-8daf3c25d6d521f3829b220b73bbe2257bda9aef.tar.gz
colobot-8daf3c25d6d521f3829b220b73bbe2257bda9aef.tar.bz2
colobot-8daf3c25d6d521f3829b220b73bbe2257bda9aef.zip
Merge branch 'dev' into debian
Conflicts: .travis.yml
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0069124..a744226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-colobot (0.1.0~pre-alpha-git-dev~r5a6b3f0-1~OdyX0) UNRELEASED; urgency=low
+colobot (0.1.0~pre-alpha-git-dev~r35faf62-1~OdyX0) UNRELEASED; urgency=low
* Initial release. (Closes: #695829)