summaryrefslogtreecommitdiffstats
path: root/debian/changelog
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-02-15 18:25:58 +0100
committerDidier Raboud <odyx@debian.org>2013-02-15 18:26:56 +0100
commit99301f5bed5fc2ae31f75a7201086a4626422426 (patch)
tree5e7ed20f199ca554fbf73ab9966dd5cca77ec8cf /debian/changelog
parentc43b06e5babe175d4b17004ad6b7fb7b97498386 (diff)
parent45040318b026f8864d244e39f1703685ad688470 (diff)
downloadcolobot-99301f5bed5fc2ae31f75a7201086a4626422426.tar.gz
colobot-99301f5bed5fc2ae31f75a7201086a4626422426.tar.bz2
colobot-99301f5bed5fc2ae31f75a7201086a4626422426.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 78baaaa..832d438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-colobot (0.1.0~pre-alpha-git-dev~rb50f9ae-1~OdyX0) UNRELEASED; urgency=low
+colobot (0.1.0~pre-alpha-git-dev~r4504031-1~OdyX0) UNRELEASED; urgency=low
* Initial release. (Closes: #695829)