Closed sbondorf closed 6 years ago
Please resolve conflicts first.
This was weird, I could only see the conflict in GitHubs' editor. There was perfectly equal code marked as conflicting. I resolved it and by accident introduced a real change: the blank line after this code doesn't have a tab any more. That's all in the diff.
I updated the project's structure to reflect the naming scheme in the scientific literature. It also reflects the current limitations better and shows where extensions can be added in the future.
This pull request is coordinated between the core'S v2.5 branch, experiments, functional tests, and the mpa rtc extension.