[Performous-commit] Lasse Karkkainen : Merge branch 'master' into dance3d

[Lasse Kärkkäi. <tr...@us...>]

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Oct 22 22:34:04 2011 +0300

Merge branch 'master' into dance3d

Conflicts:
	data/shaders/dancenote.vert

---