Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 4149:71a4b664a16a
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 16 Oct 2012 11:36:21 +0200 |
| parents | 5589b1fd459d |
| children | 0f60efc39953 |
comparison
equal
deleted
inserted
replaced
| 4148:1ba0927855b4 | 4149:71a4b664a16a |
|---|---|
| 23 | 23 |
| 24 * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, | 24 * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, |
| 25 src/main/resources/messages_de.properties, | 25 src/main/resources/messages_de.properties, |
| 26 src/main/resources/messages_de_DE.properties: | 26 src/main/resources/messages_de_DE.properties: |
| 27 Fix typo | 27 Fix typo |
| 28 | |
| 29 2012-10-16 Ingo Weinzierl <ingo@intevation.de> | |
| 30 | |
| 31 flys/issue930 | |
| 32 | |
| 33 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
| 34 Add unit [cm] to the facet description if calculation mode is W. | |
| 28 | 35 |
| 29 2012-10-15 Ingo Weinzierl <ingo@intevation.de> | 36 2012-10-15 Ingo Weinzierl <ingo@intevation.de> |
| 30 | 37 |
| 31 flys/issue904 | 38 flys/issue904 |
| 32 | 39 |
| 12806 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | 12813 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: |
| 12807 Bugfix: Evaluate the correct parameter whether to set the floodplain or | 12814 Bugfix: Evaluate the correct parameter whether to set the floodplain or |
| 12808 not. In addition, the scenario parameter used by WSPLGEN is now set | 12815 not. In addition, the scenario parameter used by WSPLGEN is now set |
| 12809 correctly. | 12816 correctly. |
| 12810 | 12817 |
| 12811 >>>>>>> .r3356 | |
| 12812 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 12818 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
| 12813 | 12819 |
| 12814 Allow longitudinal_section.q facets in wdiff states output. | 12820 Allow longitudinal_section.q facets in wdiff states output. |
| 12815 | 12821 |
| 12816 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets | 12822 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets |