Skip to content
Snippets Groups Projects
Commit 7e12b015 authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch 'master' of https://git.fortiss.org/af3/kernel.git into

3470-timing_model

Conflicts:
	org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
	org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/properties/.ratings


Signed-off-by: default avatarSimon Barner <barner@fortiss.org>
parents 12a19d99 54cab21b
No related branches found
No related tags found
1 merge request!393470 timing model
Showing
with 286 additions and 110 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 to comment