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

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

1 files changed, 1 insertions, 5 deletions

diff --git a/Cuboid.cpp b/Cuboid.cpp
index 5b1af49..5afae93 100644
--- a/Cuboid.cpp
+++ b/Cuboid.cpp
@@ -1,10 +1,6 @@
 #include "Cuboid.h"
 #include "gl.h"
 
-#include <iostream>
-//#include <stdlib.h>
-//#include <time.h>
-
 Cuboid::Cuboid(float width, float height, float depth) {
   setSize(width, height, depth);
   setPos(0, 0, 0);
@@ -60,7 +56,7 @@ void Cuboid::setPos(float x, float y, float z)
   this->z = z;
 }
 
-std::list<Triangle> Cuboid::getTriangles(/*const Matrix &modelview*/)
+std::list<Triangle> Cuboid::getTriangles()
 {
   std::list<Triangle> triangles;
   // width, height, depth