git.leopard-lacewing.eu Git - cgue

author	Peter Schaefer <schaeferpm@gmail.com>
	Fri, 24 Jun 2016 02:58:52 +0000 (04:58 +0200)
committer	Peter Schaefer <schaeferpm@gmail.com>
	Fri, 24 Jun 2016 02:58:52 +0000 (04:58 +0200)
commit	263b43f4d6419c35a62c1cb3259ded232dcbe9d6
tree	48ebc85f2f886dae3a49fdc6e83422eb05c58fd2	tree \| snapshot
parent	5acd5a4a8aef49866b0f4c0ad1969a73cac23935	commit \| diff
parent	5b765d28cc3b906c4690551c5bb3d2695656f46b	commit \| diff

Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

# Conflicts:
# Weave/Scene/Scene.cpp