Skip to content
Snippets Groups Projects
Commit c9cd556b authored by Daniel Plagge's avatar Daniel Plagge
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents 967dbd5f 83e46b45
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
de.prob.units/build.properties
+ 1
− 0
View file @ c9cd556b
...@@ -2,4 +2,5 @@ source.. = src/ ...@@ -2,4 +2,5 @@ source.. = src/
output.. = bin/ output.. = bin/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
icons/,\
plugin.xml plugin.xml
de.prob2.units.feature/feature.xml
+ 1
− 1
View file @ c9cd556b
...@@ -224,7 +224,7 @@ litigation. ...@@ -224,7 +224,7 @@ litigation.
</license> </license>
<requires> <requires>
<import feature="de.prob2.feature" version="2.3.5.qualifier"/> <import feature="de.prob2.feature" version="2.3.5" match="greaterOrEqual"/>
</requires> </requires>
<plugin <plugin
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment