diff options
| author | Didier Raboud <odyx@debian.org> | 2013-03-25 08:08:32 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-03-25 08:08:32 +0100 |
| commit | 783f3a61f7cf064149d843be26c2ef5c4b9f99f1 (patch) | |
| tree | 0934452b774b3adea3de396551f0da9854098b6f | |
| parent | 10fc342e14515b29a57572756f23aa553acc4bd9 (diff) | |
| parent | cd60d921ecb5964791ed3303f381ea59af88d33f (diff) | |
| download | colobot-783f3a61f7cf064149d843be26c2ef5c4b9f99f1.tar.gz colobot-783f3a61f7cf064149d843be26c2ef5c4b9f99f1.tar.bz2 colobot-783f3a61f7cf064149d843be26c2ef5c4b9f99f1.zip | |
Merge snapshot of dev branch (211-gcd60d92)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a47bb..628b700 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ option(TESTS "Enable tests" ON) option(CBOT_STATIC "Build CBot as static libary" OFF) # Generate desktop files, manpage, etc. -option(DESKTOP ON) +option(DESKTOP "Generate desktop files, manpages, etc" ON) # Doxygen docs are optional for installation option(INSTALL_DOCS "Install Doxygen-generated documentation" OFF) diff --git a/debian/changelog b/debian/changelog index 5d4e736..e88b905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -colobot (0.1.0~pre-alpha-git-dev~r8f6fbdd-1~OdyX0) UNRELEASED; urgency=low +colobot (0.1.0~pre-alpha-git-dev~r211-gcd60d92-1~OdyX0) UNRELEASED; urgency=low * Initial release. (Closes: #695829) + * New snapshot of dev branch (211-gcd60d92) - -- Didier Raboud <odyx@debian.org> Wed, 19 Dec 2012 09:10:47 +0100 + -- Didier Raboud <odyx@debian.org> Mon, 25 Mar 2013 08:08:32 +0100 |