repositories / ker2014-2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36cd660 a1f405b)
Merge branch 'master' of https://github.com/dopefishh/ker2014-2
authorMargo van der Stam <margo.stam@gmail.com>
Tue, 3 Feb 2015 21:44:02 +0000 (22:44 +0100)
committerMargo van der Stam <margo.stam@gmail.com>
Tue, 3 Feb 2015 21:44:02 +0000 (22:44 +0100)
1  2 
report/ass2-2.tex patch | diff1 | diff2 | blob | history

diff --cc report/ass2-2.tex
Simple merge
1415-S1 - SOW-BKI312: Knowledge representation and reasoning