summaryrefslogtreecommitdiffstats
path: root/Vertex.h
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-12-09 16:28:58 +0100
committerMatthias Schiffer <matthias@gamezock.de>2009-12-09 16:28:58 +0100
commit8705ce3d468c3cd22159bc0fedf727e8250861ca (patch)
treef94debc4b7f52badac6052f016e9ab2f9232b095 /Vertex.h
parent3035d4c9e76d6f28579d0b5a024e1c1b2a538919 (diff)
parent3b534c013dd072d0296ebaac434e8c943ab88c14 (diff)
downloadc3d-8705ce3d468c3cd22159bc0fedf727e8250861ca.tar
c3d-8705ce3d468c3cd22159bc0fedf727e8250861ca.zip
Merge branch 'master' of git://git.gamezock.de/c3d
Conflicts: DisplayClass.cpp
Diffstat (limited to 'Vertex.h')
0 files changed, 0 insertions, 0 deletions