DOC: added blurb in changelog

phobson · phobson · commit 38368ae70d08 · 2014-01-12T20:29:34.000-08:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,7 +1,13 @@
+<<<<<<< HEAD
 2013-12-30 Made streamplot grid size consistent for different types of density
            argument. A 30x30 grid is now used for both density=1 and
            density=(1, 1).
 
+2013-12-03 Added a pure boxplot-drawing method that allow a more complete
+           customization of boxplots. It takes a list of dicts contains stats.
+	   Also created a function (`cbook.boxplot_stats`) that generates the
+	   stats needed.
+
 2013-11-28 Added qhull extension module to perform Delaunay triangulation more
            robustly than before.  It is used by tri.Triangulation (and hence
            all pyplot.tri* methods) and mlab.griddata.  Deprecated
