Mercurial > dive4elements > river
diff flys-artifacts/doc/conf/artifacts/minfo.xml @ 3649:33bfc01410fb
Merged revisions 5375,5379,5382 via svnmerge from
file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk
........
r5375 | ingo | 2012-09-07 11:26:45 +0200 (Fr, 07 Sep 2012) | 1 line
Tagged 'flys-artifacts' as 2.9
........
r5379 | rrenkert | 2012-09-07 13:58:41 +0200 (Fr, 07 Sep 2012) | 4 lines
Issue 791.
Add start km to data to compare reference and target km in next state.
........
r5382 | rrenkert | 2012-09-07 14:03:48 +0200 (Fr, 07 Sep 2012) | 3 lines
Set data for characteristic diameter for use in parameter matrix UI.
........
flys-artifacts/tags/2.9@5388 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 07 Sep 2012 13:12:08 +0000 |
parents | f3717e625b0a |
children | 3dcc4feff243 |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml Fri Sep 07 09:12:11 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/minfo.xml Fri Sep 07 13:12:08 2012 +0000 @@ -197,7 +197,8 @@ </state> <state id="state.minfo.bed.char_diameter" description="state.minfo.bed.char_diameter" state="de.intevation.flys.artifacts.states.minfo.CharDiameter"> - <data name="diameter" type="String"/> + <data name="bed_diameter" type="options"/> + <data name="load_diameter" type="options"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">