Fix license issue
Update changelog
Upgrade some settings in the configuration test suite
Add the obr.xml file for the web console plugin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/doc/changelog.txt b/ipojo/manipulator/doc/changelog.txt
index 866548b..683250e 100644
--- a/ipojo/manipulator/doc/changelog.txt
+++ b/ipojo/manipulator/doc/changelog.txt
@@ -1,3 +1,14 @@
+Changes from 1.2.0 to 1.4.0
+---------------------------
+** Bug
+ * [FELIX-1302] - Manipulator never ignore annotations
+ * [FELIX-1319] - Issue in the metadata overiding analysis in iPOJO annotations
+
+** Improvement
+ * Update parent pom
+ * [FELIX-943] - Allow iPOJO manipulator to manipulate directories
+
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Bug
@@ -27,4 +38,4 @@
Version 0.8.0
-------------
- * Initial release
\ No newline at end of file
+ * Initial release