Commit 1cf018cc authored by yoogx's avatar yoogx

Merge branch 'master' of https://github.com/yoogx/ocarina

Conflicts:
	src/core/model/ocarina-analyzer-aadl-names.adb
parents 789e4565 39cbc046
Markdown is supported
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