]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
projects / cgue_weave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abc1347 6d30291)
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
authorLockedLunatic <locked.lunatic@aon.at>
Tue, 14 Apr 2015 16:50:26 +0000 (18:50 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Tue, 14 Apr 2015 16:50:26 +0000 (18:50 +0200)
Conflicts:
Weave/Game.cpp


Trivial merge
CGUE Weave Projekt