X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Changes;h=8c8e18a1ab8d4f62381aed801e5b5413f05a4026;hb=70d7962e28eed7d00bd07c493f8dd5c01a8e3711;hp=e8f9c9935f26085cad15c7fe00e4b6252c7a5d9d;hpb=a20ff0fe7cedb1750b40d04307a1e2f5230758df;p=gitmo%2FPackage-Stash.git

diff --git a/Changes b/Changes
index e8f9c99..8c8e18a 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,18 @@
 Revision history for Package-Stash
 
 {{$NEXT}}
+      - stop manually inserting conflict checking into Makefile.PL since we're
+        using the dzil Conflicts plugin now
+
+0.18  2011-01-03
+      - non-trial release
+
+0.17-TRIAL  2011-01-03
+      - use Dist::Zilla::Plugin::Conflicts rather than doing it by hand
+      - silence deprecation warnings for the method renaming for now
+
+0.16-TRIAL  2010-12-31
+      - use Dist::CheckConflicts
 
 0.15-TRIAL  2010-11-16
       - split the XS conversion out to its own dist (Package-Stash-XS), and