Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 3309:fd3243d892a9
Fixed ChangeLog
flys-artifacts/trunk@4998 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 13 Jul 2012 15:04:36 +0000 |
| parents | 5ccd51ca11ce |
| children | 8af1111af180 |
comparison
equal
deleted
inserted
replaced
| 3308:5ccd51ca11ce | 3309:fd3243d892a9 |
|---|---|
| 1 <<<<<<< .mine | |
| 2 2012-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> | 1 2012-07-13 Sascha L. Teichmann <sascha.teichmann@intevation.de> |
| 3 | 2 |
| 4 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: | 3 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: |
| 5 Fixed problem with string operation precedence. | 4 Fixed problem with string operation precedence. |
| 6 | 5 |
| 7 ======= | |
| 8 2012-07-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 6 2012-07-13 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
| 9 | 7 |
| 10 * doc/conf/meta-data.xml: very basic official lines matching the current | 8 * doc/conf/meta-data.xml: very basic official lines matching the current |
| 11 artifact (for this it is wrongly placed in previous calc.-part, for | 9 artifact (for this it is wrongly placed in previous calc.-part, for |
| 12 now. | 10 now. |
| 13 | 11 |
| 14 >>>>>>> .r4996 | |
| 15 2012-07-13 Christian Lins <christian.lins@intevation.de> | 12 2012-07-13 Christian Lins <christian.lins@intevation.de> |
| 16 | 13 |
| 17 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: | 14 * src/main/java/de/intevation/flys/utils/MapfileGenerator.java: |
| 18 Create shapefile directory instead of shapefile 'file'. | 15 Create shapefile directory instead of shapefile 'file'. |
| 19 | 16 |