Mercurial > dive4elements > river
comparison flys-client/ChangeLog @ 3367:cccd6183b046
ChangeLog: Removed remains from former conflict.
flys-client/trunk@5054 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 19 Jul 2012 08:51:01 +0000 |
| parents | 8bedd1fcaeee |
| children | bf080e932d54 |
comparison
equal
deleted
inserted
replaced
| 3366:8bedd1fcaeee | 3367:cccd6183b046 |
|---|---|
| 1 2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | |
| 2 | |
| 3 * ChangeLog: Removed remains from former conflict. | |
| 4 | |
| 1 2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> | 5 2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> |
| 2 | 6 |
| 3 * src/main/java/de/intevation/flys/client/client/ui/fixation/FixFunctionSelect.java | 7 * src/main/java/de/intevation/flys/client/client/ui/fixation/FixFunctionSelect.java |
| 4 src/main/java/de/intevation/flys/client/client/ui/chart/NaviChartOutputTab.java: | 8 src/main/java/de/intevation/flys/client/client/ui/chart/NaviChartOutputTab.java: |
| 5 Removed superfluous imports. | 9 Removed superfluous imports. |
| 347 src/main/java/de/intevation/flys/client/client/FLYSConstants.java, | 351 src/main/java/de/intevation/flys/client/client/FLYSConstants.java, |
| 348 src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, | 352 src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, |
| 349 src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: | 353 src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: |
| 350 Add showpointlabel stlye attribute. | 354 Add showpointlabel stlye attribute. |
| 351 | 355 |
| 352 | |
| 353 >>>>>>> .r4973 | |
| 354 2012-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> | 356 2012-07-11 Sascha L. Teichmann <sascha.teichmann@intevation.de> |
| 355 | 357 |
| 356 * src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java: | 358 * src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java: |
| 357 Authenticates against simple text file. Specified by env variable FLYS_USER_FILE | 359 Authenticates against simple text file. Specified by env variable FLYS_USER_FILE |
| 358 or system property flys.user.file . | 360 or system property flys.user.file . |