Commit 12445b82 authored by Andreas Bayha's avatar Andreas Bayha
Browse files

Merge branch '7276' into 'master'

2.21 -> 2.22

See merge request !18
parents 3ec5508b 78e9b22e
Pipeline #36571 passed with stages
in 6 minutes and 30 seconds
Subproject commit ea8047146f2abe152d094bf06a4ff07c3d0edced
Subproject commit becc489eadea4ef1129ce08536f97b906e16a969
Subproject commit 062f106a89c50c450eda9db569abda98605b4eb7
Subproject commit dc97e09fd35b11efa2f72962046dc6c1a548864c
Subproject commit 39425a975212762ea3bea6f0fdf35ca62af0cb47
Subproject commit 4d856b1ae0bac229e03383ec85c9774dc7242882
Subproject commit df08ed11b2e15a7a4352104d3947c39ee3f8c6a7
Subproject commit 37060271fc58c11dfacb9078965aae0848747fb8
Subproject commit 1fe4244131f873f6963a35b6a4a0b10fc3477d33
Subproject commit 4e830a7c82950bbdaf7664efc0d17123ee0a7514
Subproject commit c76e22ae15e1a9bf4d4c1a8427cac0dac472cb25
Subproject commit 3d8d77819c3ae8bf22c606225ec805aa27d157c8
Subproject commit f42a158471c3852e2c9a81b96705e0d1b4e856e7
Subproject commit 48c8d697fc4b0c4d8a64ddcae4da1e0cf5141718
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.fortiss.af3.phoenix.feature_2.21.0.qualifier.jar" id="org.fortiss.af3.phoenix.feature" version="2.21.0.qualifier">
<feature url="features/org.fortiss.af3.phoenix.feature_2.22.0.qualifier.jar" id="org.fortiss.af3.phoenix.feature" version="2.22.0.qualifier">
<category name="latest"/>
</feature>
<category-def name="latest" label="AutoFOCUS 3, version 2.14-LATEST"/>
......
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<name>AutoFOCUS 3 2.14-LATEST Update Site</name>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<artifactId>org.fortiss.af3.phoenix.p2site</artifactId>
<groupId>org.fortiss.af3</groupId>
......
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.fortiss.tooling.feature_2.21.0.qualifier.jar" id="org.fortiss.tooling.feature" version="2.21.0.qualifier">
<feature url="features/org.fortiss.tooling.feature_2.22.0.qualifier.jar" id="org.fortiss.tooling.feature" version="2.22.0.qualifier">
<category name="latest"/>
</feature>
<category-def name="latest" label="Tooling Kernel 2.14-LATEST"/>
......
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<name>Tooling Kernel 2.14-LATEST Update Site</name>
<version>2.21.0-SNAPSHOT</version>
<version>2.22.0-SNAPSHOT</version>
<artifactId>org.fortiss.tooling.p2site</artifactId>
<groupId>org.fortiss.tooling</groupId>
......
Subproject commit 9d537df8e0cdb3489199f37ee30e0094367f5525
Subproject commit 36cc49f2a40e20e5fae8db16ef425a363498079e
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment