--- trunk/ChangeLog	2010/04/30 09:22:48	361
+++ trunk/ChangeLog	2010/06/02 10:06:25	365
@@ -1,4 +1,14 @@
-<<<<<<< .mine
+2010-06-02	Roland Geider <roland.geider@intevation.de>
+
+	* formed/plugins/export/xls.py: updated regular expression
+
+2010-05-17	Frank Koormann <frank.koormann@intevation.de>
+
+	* formed/formed/plugins/export/latex.py: Improved section labeling.
+
+	* formed/formed/plugins/export/xls.py: 
+	  Export references (ie where are the lists used).
+
 2010-04-30  Torsten Irländer <torsten.irlaender@intevation.de>
 
 	* formed/formed/plugins/modify/rules.py (VariableType.substitute): Do
@@ -7,9 +17,9 @@
 2010-04-28	Roland Geider <roland.geider@intevation.de>
 
 	* formed/plugins/export/xls.py: Radiogroups are exported
-        * formed/plugins/export/xsd.py: WASKA formedtree.xml validates XSD
-        JMD formedtree.xml validates XSD
-        
+	* formed/plugins/export/xsd.py: WASKA formedtree.xml validates XSD
+	  JMD formedtree.xml validates XSD
+
 2010-04-08  Torsten Irländer <torsten.irlaender@intevation.de>
 
 	* formed/formed/plugins/modify/rules.py