diff flys-client/ChangeLog @ 3384:a6b7f0585761

Merge point/line label styles flys-client/trunk@5133 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Christian Lins <christian.lins@intevation.de>
date Thu, 26 Jul 2012 10:05:50 +0000
parents c20d5794a93f
children b5930486594d
line wrap: on
line diff
--- a/flys-client/ChangeLog	Wed Jul 25 12:39:13 2012 +0000
+++ b/flys-client/ChangeLog	Thu Jul 26 10:05:50 2012 +0000
@@ -1,3 +1,14 @@
+2012-07-26	Christian Lins	<christian.lins@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/server/StyleHelper.java,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.java,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties,
+	  src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java:
+	  Merge point/line label styles. Add new style options for point/line
+	  label background.
+
 2012-07-25	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/shared/model/DefaultArtifactDescription.java:

http://dive4elements.wald.intevation.org