# HG changeset patch # User Felix Wolfsteller # Date 1354023008 -3600 # Node ID a46dc120afd70423560cdeba704812c6a97c02ef # Parent 585374987c5cb0bf168f7e8374e4127c4fab972c# Parent 32a4651eef93b4ff5546ec34ebaf6be773cfbea5 Merged. diff -r 32a4651eef93 -r a46dc120afd7 flys-artifacts/doc/conf/artifacts/manualpoints.xml --- a/flys-artifacts/doc/conf/artifacts/manualpoints.xml Tue Nov 27 14:20:46 2012 +0100 +++ b/flys-artifacts/doc/conf/artifacts/manualpoints.xml Tue Nov 27 14:30:08 2012 +0100 @@ -23,6 +23,7 @@                         +         diff -r 32a4651eef93 -r a46dc120afd7 flys-artifacts/doc/conf/artifacts/minfo.xml --- a/flys-artifacts/doc/conf/artifacts/minfo.xml Tue Nov 27 14:20:46 2012 +0100 +++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Tue Nov 27 14:30:08 2012 +0100 @@ -168,6 +168,7 @@ + diff -r 32a4651eef93 -r a46dc120afd7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Tue Nov 27 14:20:46 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Tue Nov 27 14:30:08 2012 +0100 @@ -124,6 +124,7 @@ FLSC("fix_longitudinal_section_curve"), FDC("fix_derivate_curve"), EWQ("extreme_wq_curve"), + BHM("bedheight_middle"), HD("historical_discharge"); private String chartTypeString;