Merge branch 'modelica'

afc4957d · Johannes Mey · ebbf18e2 · 1c56c33e · afc4957d · afc4957d
Commit afc4957d authored 5 years ago by Johannes Mey
--- a/testprograms/simpleScope/test/.project
+++ b/testprograms/simpleScope/test/.project
--- a/testprograms/simpleScope/test/.settings/org.eclipse.jdt.core.prefs
+++ b/testprograms/simpleScope/test/.settings/org.eclipse.jdt.core.prefs
--- a/testprograms/simpleScope/test/src/core/Person.java
+++ b/testprograms/simpleScope/test/src/core/Person.java
--- a/testprograms/simpleScope/test/src/ext/Employee.java
+++ b/testprograms/simpleScope/test/src/ext/Employee.java
--- a/tools/DrAST-1.2.2.jar
+++ b/tools/DrAST-1.2.2.jar
--- a/tools/rd-builder.jar
+++ b/tools/rd-builder.jar
--- a/tools/relast.jar
+++ b/tools/relast.jar