Merge branch 'master' of git://git.gamezock.de/c3d

Conflicts:
	Cubehole.cpp
	Cubehole.h
	DisplayClass.cpp
	Trapezocube.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/Cuboid.h b/Cuboid.h
index 7c4b4c5..25d9f73 100644
--- a/Cuboid.h
+++ b/Cuboid.h
@@ -19,7 +19,7 @@ class Cuboid
     float getPosZ();

     void setSize(float w, float h, float d);

     void setPos(float x, float y, float z);

-    std::list<Triangle> getTriangles(/*const Matrix &modelview*/);

+    std::list<Triangle> getTriangles();

   

   private:
     float width, height, depth;