]> git.leopard-lacewing.eu Git - cgue_weave.git/commit
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
authorLockedLunatic <locked.lunatic@aon.at>
Tue, 21 Apr 2015 14:19:40 +0000 (16:19 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Tue, 21 Apr 2015 14:19:40 +0000 (16:19 +0200)
commit883fde70f9a3be6274c04cfc235d8ea47c2686a4
treecd212ae1ea28260e9698912699cf471914d6b6d0
parent520ee3537397b95169b055416ad503533888802b
parent1b458b727432b522f69eab376f6c7125ff4cfad1
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

Conflicts:
.gitignore