diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-09 01:14:09 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-09 01:14:09 +0100 |
| commit | e44fb038ec4404f2c38b698ec95c80d051b8d0cf (patch) | |
| tree | 95ae8fe8728ddd9fb8456973a095f4b44ceaee70 /src/core/managed | |
| parent | 0605eed698443dc18c48340084507c90e97a9333 (diff) | |
| parent | 4ec16559eba87553241e2e20a9e31a62b7aed08a (diff) | |
Merge branch 'master' of somweyr.de:ousia
Conflicts:
application/src/core/model/Document.cpp
application/src/core/model/Domain.cpp
Diffstat (limited to 'src/core/managed')
0 files changed, 0 insertions, 0 deletions