ejcoumans d0f09040e9 fixed some merging conflicts

2006-09-27 20:58:49 +00:00

..

BMF_Api.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_Api.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_BitmapFont.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_BitmapFont.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_font_helv10.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_FontData.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_Fonts.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

BMF_Settings.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

CMakeLists.txt

First stage in refactoring Bullet: moved Bullet Collision and Dynamics and LinearMath into src folder, and all files in Collision Detection and Dynamics have bt prefix.

2006-09-25 08:58:57 +00:00

DebugCastResult.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

DemoApplication.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

DemoApplication.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

GL_ShapeDrawer.cpp

fixed some merging conflicts

2006-09-27 20:58:49 +00:00

GL_ShapeDrawer.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

GL_Simplex1to4.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

GL_Simplex1to4.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

GLDebugDrawer.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

GLDebugDrawer.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

GlutStuff.cpp

first step in refactoring/cleaning up demos

2006-09-11 05:31:22 +00:00

GlutStuff.h

first step in refactoring/cleaning up demos

2006-09-11 05:31:22 +00:00

Jamfile

updated demos includes

2006-09-11 06:10:40 +00:00

RenderTexture.cpp

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00

RenderTexture.h

merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.

2006-09-27 20:43:51 +00:00