diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-16 02:36:04 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-16 02:36:04 +0100 |
| commit | bd9581fc44fb0a653105c76e7ad7b2f4dba8075b (patch) | |
| tree | fe02bfd78d7185f4ca1618bc977bcfb571f5f03b /CMakeLists.txt | |
| parent | c6aa669aac80466ea287e9a27348c1068cc1f17e (diff) | |
| parent | a98797188a48148f5d8b268bf623b15d283d6334 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Conflicts:
application/CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index efef6d6..4303058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ ADD_LIBRARY(ousia_core src/core/managed/Managed src/core/managed/ManagedType src/core/managed/Manager -# src/core/model/Domain + src/core/model/Domain src/core/model/Typesystem src/core/parser/Parser src/core/parser/ParserStack |