updated changelog

chrisgorgo · chrisgorgo · commit f68a2d133151 · 2012-09-04T12:58:10.000+02:00
diff --git a/CHANGES b/CHANGES
@@ -2,6 +2,7 @@ Next release
 ============
 
 *ENH: New interfaces: ICC, Meshfix
+*ENH: added no_flatten option to Merge
 
 Release 0.6.0 (Jun 30, 2012)
 ============================
