diff options
| author | Marja Hassinen <marja.hassinen@nokia.com> | 2010-11-08 09:47:22 +0200 |
|---|---|---|
| committer | Marja Hassinen <marja.hassinen@nokia.com> | 2010-11-08 09:47:22 +0200 |
| commit | 8ef115428acfbac109795a77248d38ddd68742e5 (patch) | |
| tree | dd8c7a42da5f69d7cd008ac798a26f637fab2878 /debian | |
| parent | 16356ecfbd06e3b3c45ca00461c35a37f07d0240 (diff) | |
| parent | bbcb50037218ac6685c6de68f06ae847d43298a7 (diff) | |
Merge remote branch 'remotes/origin/conditional_commanding'
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index c8a8cbc8..e2f2e534 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -contextkit (0.5.19.3~unreleased) unstable; urgency=low +contextkit (0.5.21~unreleased) unstable; urgency=low - * + * Commanding is only allowed if the env var CONTEXT_COMMANDING is set. + * 0.5.20 is skipped because this release merges 2 separate release branches - -- Jean-Luc Lamadon <jean-luc.lamadon@nokia.com> Wed, 03 Nov 2010 10:32:03 +0200 + -- Marja Hassinen <marja.hassinen@nokia.com> Mon, 08 Nov 2010 09:45:11 +0200 contextkit (0.5.19.2) unstable; urgency=low |