From: Peter Schaefer <schaeferpm@gmail.com>
Date: Fri, 24 Jun 2016 02:58:52 +0000 (+0200)
Subject: Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=263b43f4d6419c35a62c1cb3259ded232dcbe9d6;p=cgue_weave.git

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

# Conflicts:
#	Weave/Scene/Scene.cpp
---

263b43f4d6419c35a62c1cb3259ded232dcbe9d6