diff options
| author | Matthias Schiffer <matthias@gamezock.de> | 2009-12-10 21:24:40 +0100 |
|---|---|---|
| committer | Matthias Schiffer <matthias@gamezock.de> | 2009-12-10 21:24:40 +0100 |
| commit | e744ab213aeaccfe1aea6050907019aad9cf1911 (patch) | |
| tree | e9d741a393e2178c5b90f48df0d0e3975f564e63 /DisplayClass.h | |
| parent | 823e55c9c49cf97531b66e6b15c41d9f9003bc32 (diff) | |
| parent | d439daec66c28f85debc2479e95eadb5fc3c00a2 (diff) | |
| download | c3d-e744ab213aeaccfe1aea6050907019aad9cf1911.tar c3d-e744ab213aeaccfe1aea6050907019aad9cf1911.zip | |
Merge branch 'master' of git://git.gamezock.de/c3d
Conflicts:
Cubehole.cpp
Cubehole.h
DisplayClass.cpp
Trapezocube.cpp
Diffstat (limited to 'DisplayClass.h')
| -rw-r--r-- | DisplayClass.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DisplayClass.h b/DisplayClass.h index 0b24dc6..04ff651 100644 --- a/DisplayClass.h +++ b/DisplayClass.h @@ -1,7 +1,7 @@ #ifndef _DISPLAYCLASS_H_ #define _DISPLAYCLASS_H_ -#include "Trapezocube.h" +#include "Cubehole.h" class DisplayClass
{
@@ -19,7 +19,7 @@ class DisplayClass static Renderer renderer; - Trapezocube cubeing[8];
+ Cubehole cubehole;
};
#endif /*_DISPLAYCLASS_H_*/ |