diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-25 23:11:02 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-25 23:11:02 +0100 |
| commit | 12461ce97603f55fefc1863ac9fd179177a77804 (patch) | |
| tree | b95db6ab2c2c6c2fba430218411a4ddf1d31b19f /src/core/XML.cpp | |
| parent | 84c9abc3e9762c4486ddc5ca0352a5d697a51987 (diff) | |
| parent | 5a67fc7d682ddba6a862aacf616d02cd20b727eb (diff) | |
Merge branch 'astoecke_tokens' of somweyr.de:ousia into astoecke_tokens
Conflicts:
application/src/core/common/Token.hpp
application/src/core/parser/utils/TokenizedData.cpp
application/src/core/parser/utils/TokenizedData.hpp
application/src/core/parser/utils/Tokenizer.cpp
application/test/core/parser/utils/TokenizedDataTest.cpp
Diffstat (limited to 'src/core/XML.cpp')
0 files changed, 0 insertions, 0 deletions