Skip to content
Snippets Groups Projects
Commit ed2e21e9 authored by Andreas Bayha's avatar Andreas Bayha
Browse files

Merge branch '3776' into 'master'

3776

See merge request !14
parents 7629f29f b2c4a8d5
No related branches found
No related tags found
1 merge request!143776
Pipeline #34127 failed
Subproject commit 6cff9d40660964a059b2abab06ee447caf27025d
Subproject commit ab6f788685493c36e3c82428485cdf3c6b5de8b8
Subproject commit 556c52e036b6772ba5c99e83454f03952baea079
Subproject commit b41e444087c2179e90b92fd8a4ce9225446d5c36
Subproject commit ab311b339e43d950fe070abbb8ef21f7e025bc07
Subproject commit f1aa1d6ec056ba9b730891a48cb785f311ce0aea
......@@ -50,6 +50,10 @@
<module>kernel/org.fortiss.tooling.spiderchart.ui</module>
<module>kernel/org.fortiss.tooling.ext.reuse</module>
<module>kernel/org.fortiss.tooling.ext.reuse.ui</module>
<module>kernel/org.fortiss.tooling.ext.variability</module>
<module>kernel/org.fortiss.tooling.ext.variability.ui</module>
<module>kernel/org.fortiss.variability</module>
</modules>
</profile>
<profile>
......@@ -104,6 +108,8 @@
<module>af3/org.fortiss.af3.task.ui</module>
<module>af3/org.fortiss.af3.timing</module>
<module>af3/org.fortiss.af3.timing.ui</module>
<module>af3/org.fortiss.af3.variability.featuremodel</module>
<module>af3/org.fortiss.af3.variability.featuremodel.ui</module>
<module>af3-rcp/org.fortiss.af3.rcp.application</module>
<module>af3-rcp/org.fortiss.af3.rcp.help</module>
</modules>
......
Subproject commit fd940e9cb5ba87b3eb143f846a8fcaed07d4beca
Subproject commit 2c8115323c8d5bfe3fdca71ccbbdda4a92689824
Subproject commit 80f34defdaa82d63c7857e3d07a2d1d4f71c3a12
Subproject commit 1efa3eb0eabca967d2b9a3319e07e3919fb1b0d7
Subproject commit 691c87626608634ddcebe75e6065002b188c0e9c
Subproject commit ed4ee4b7a94b9ac72478e355300787d23c1b2078
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment