--- a/flys-client/ChangeLog	Mon Oct 15 09:29:25 2012 +0200
+++ b/flys-client/ChangeLog	Mon Oct 15 09:31:50 2012 +0200
@@ -1,3 +1,72 @@
+2012-10-15	Christian Lins	<christian.lins@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties,
+	  flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  flys-client/src/main/java/de/intevation/flys/client/client/event/StepBackEvent.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/event/StepForwardEvent.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/AbstractUIProvider.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/AutoIntegerPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/BooleanPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/ContinuePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacagePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageWidget.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DemDatacagePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DistanceOnlyPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DistancePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleArrayPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleInputPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DoubleRangePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugeTimeRangePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/IntegerRangePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/LinkSelection.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationPanel.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/MapSelection.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/ModuleSelection.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/MultiPeriodPanel.java:
+	  Squash warnings and TODOs.
+
+2012-10-14	Christian Lins	<christian.lins@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties,
+	  flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/WspDatacagePanel.java:
+	  Improve warning when user does not select a waterlevel calculation (#914).
+
+2012-10-14	Christian Lins	<christian.lins@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugeTree.java:
+	  Fix for NPE that can occur when comparing Double with double.
+
+2012-10-14	Christian Lins	<christian.lins@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSWorkspace.java:
+	  Fix for NPE in FLYSWorkspace.bringUp() (#933).
+
+2012-10-14	Christian Lins	<christian.lins@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java,
+	  flys-client/src/main/java/de/intevation/flys/client/client/ui/DatacageTwinPanel.java:
+	  More fixes for #897: missing resource exceptions when handling other exceptions.
+
+2012-10-12	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/ui/UIProviderFactory.java:
+	  Register new UI provider for Q input per segment.
+
+2012-10-12	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* flys-client/src/main/java/de/intevation/flys/client/client/ui/QSegmentedInputPanel.java:
+	  New, initial GUI for Q input per segment.
+
 2012-10-12  Ingo Weinzierl <ingo@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/ui/GaugeTimeRangePanel.java: