Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Model_OATFLOWERM
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

42c85f7d

Commit 42c85f7d authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'master' into 'develop'

Added description with image

See merge request VIPS/Model_OATFLOWERM!1

parents f470ab52 eedf212c

No related branches found

No related tags found

1 merge request!1Added description with image

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java 12 additions, 2 deletions

...nibio/vips/model/oatfloweringmodel/OatFloweringModel.java
src/main/resources/images/RisikoForDon650.gif 0 additions, 0 deletions

src/main/resources/images/RisikoForDon650.gif
src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts.properties 1 addition, 1 deletion

...es/no/nibio/vips/model/oatfloweringmodel/texts.properties
src/main/resources/no/nibio/vips/model/oatfloweringmodel/texts_nb.properties 1 addition, 1 deletion

...no/nibio/vips/model/oatfloweringmodel/texts_nb.properties

with 14 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment