Mercurial > dive4elements > river
comparison flys-artifacts/ChangeLog @ 4145:d39f229ea990
Merged.
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 16 Oct 2012 11:27:27 +0200 |
| parents | 0ac1158605bd d7db9baa4e62 |
| children | 5589b1fd459d |
comparison
equal
deleted
inserted
replaced
| 4142:0ac1158605bd | 4145:d39f229ea990 |
|---|---|
| 2 | 2 |
| 3 * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, | 3 * src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java, |
| 4 src/main/resources/messages_de.properties, | 4 src/main/resources/messages_de.properties, |
| 5 src/main/resources/messages_de_DE.properties: | 5 src/main/resources/messages_de_DE.properties: |
| 6 Fix typo | 6 Fix typo |
| 7 | |
| 8 2012-10-16 Ingo Weinzierl <ingo@intevation.de> | |
| 9 | |
| 10 flys/issue930 | |
| 11 | |
| 12 * src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java: | |
| 13 Add unit [cm] to the facet description if calculation mode is W. | |
| 7 | 14 |
| 8 2012-10-15 Ingo Weinzierl <ingo@intevation.de> | 15 2012-10-15 Ingo Weinzierl <ingo@intevation.de> |
| 9 | 16 |
| 10 flys/issue904 | 17 flys/issue904 |
| 11 | 18 |
| 12785 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: | 12792 * src/main/java/de/intevation/flys/artifacts/states/FloodMapState.java: |
| 12786 Bugfix: Evaluate the correct parameter whether to set the floodplain or | 12793 Bugfix: Evaluate the correct parameter whether to set the floodplain or |
| 12787 not. In addition, the scenario parameter used by WSPLGEN is now set | 12794 not. In addition, the scenario parameter used by WSPLGEN is now set |
| 12788 correctly. | 12795 correctly. |
| 12789 | 12796 |
| 12790 >>>>>>> .r3356 | |
| 12791 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> | 12797 2011-12-05 Felix Wolfsteller <felix.wolfsteller@intevation.de> |
| 12792 | 12798 |
| 12793 Allow longitudinal_section.q facets in wdiff states output. | 12799 Allow longitudinal_section.q facets in wdiff states output. |
| 12794 | 12800 |
| 12795 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets | 12801 * doc/conf/artifacts/winfo.xml: Added longitudinal_section.q facets |