summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2014-12-09 00:05:34 -0400
committerJoey Hess2014-12-09 00:05:34 -0400
commit57520809299789956479256f68119a3043cf2f9a (patch)
treeeed478c5d3686e5504fecbead9fa47bfc9630e6e /debian
parent9841594c852bd7a663c25b961df11400557502f5 (diff)
parent040a5fe3c75930f08667369357a77ededf815c5a (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 827c7986..68564473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-propellor (1.1.1) UNRELEASED; urgency=medium
+propellor (1.2.0) unstable; urgency=medium
* Display a warning when ensureProperty is used on a property which has
Info and is so prevented from propigating it.
+ * Removed boolProperty; instead the new toResult can be used. (API change)
+ * Include Propellor.Property.OS, which was accidentially left out of the
+ cabal file in the last release.
- -- Joey Hess <id@joeyh.name> Sun, 07 Dec 2014 17:08:55 -0400
+ -- Joey Hess <id@joeyh.name> Tue, 09 Dec 2014 00:05:09 -0400
propellor (1.1.0) unstable; urgency=medium