diff options
| author | RncLsn <rnc.lsn@gmail.com> | 2015-06-26 12:09:01 +0100 |
|---|---|---|
| committer | RncLsn <rnc.lsn@gmail.com> | 2015-06-26 12:09:01 +0100 |
| commit | 271b05caedafb3b7433d2163d59b2ab5f8106dfe (patch) | |
| tree | 233481bccd68e4b718598320f121024db16ff0e5 /src/uk/ac/ox/cs/pagoda/reasoner/QueryEngine.java | |
| parent | 29eecb27c7f91de92b21bbd646d8b7a55e526833 (diff) | |
| parent | 7cd962751db2a88f426b8b9d7b9dd0d76e2cc1b5 (diff) | |
| download | ACQuA-271b05caedafb3b7433d2163d59b2ab5f8106dfe.tar.gz ACQuA-271b05caedafb3b7433d2163d59b2ab5f8106dfe.zip | |
Merge remote-tracking branch 'origin/Query-dependent-skolemisation' into Query-dependent-skolemisation
Conflicts:
src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
src/uk/ac/ox/cs/pagoda/reasoner/MyQueryReasoner.java
src/uk/ac/ox/cs/pagoda/reasoner/full/HermitChecker.java
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda/reasoner/QueryEngine.java')
0 files changed, 0 insertions, 0 deletions