Mercurial > dive4elements > river
changeset 1778:5a1d59926a72
Fixed incorrect ChangeLog-merge.
flys-artifacts/trunk@3100 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 28 Oct 2011 09:02:48 +0000 |
| parents | a8aa343799a2 |
| children | 2fe270661b20 |
| files | flys-artifacts/ChangeLog |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Oct 28 09:00:51 2011 +0000 +++ b/flys-artifacts/ChangeLog Fri Oct 28 09:02:48 2011 +0000 @@ -1,8 +1,3 @@ -2011-10-28 Ingo Weinzierl <ingo@intevation.de> - - * src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix: - Catch IOException - flys-artifacts compiles again. - 2011-10-28 Felix Wolfsteller <felix.wolfsteller@intevation.de> Extracted getFlysContext from FLYSArtifacts into FLYSUtils. @@ -19,6 +14,11 @@ 2011-10-28 Ingo Weinzierl <ingo@intevation.de> + * src/main/java/de/intevation/flys/exports/MapGenerator.java: Bugfix: + Catch IOException - flys-artifacts compiles again. + +2011-10-28 Ingo Weinzierl <ingo@intevation.de> + * doc/conf/artifacts/winfo.xml: Defined "floodmap.barriers" as valid facet for floodmaps.