Skip to content
Snippets Groups Projects
Commit c8734d12 authored by al.schwinn's avatar al.schwinn
Browse files

Merge branch 'Bug1381_namingRTActions' into gsi 

Conflicts:
	silecs-model/src/xml/DesignSchema.xsd
parents 175a73a8 c7c72fd8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy