Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

2012-04-09 11:01:02 +02:00
parent 15cd5d90f4 df68045d52
commit 48717284d5
84 changed files with 1086 additions and 873 deletions
--- a/library/PolyVoxUtil/source/Dummy.cpp
+++ b/library/PolyVoxUtil/source/Dummy.cpp
@ -13,4 +13,4 @@ namespace PolyVox
 	{
 		return x;
 	}
-}
+}