resolved conflict state with HEAD r14096
[blender.git] / source / gameengine / BlenderRoutines / KX_BlenderPolyMaterial.cpp
2007-11-06 Martin PoirierFilling in branch from trunk
2006-11-20 Brecht Van LommelAdded custom vertex/edge/face data for meshes:
2005-01-16 Kester MaddockUnified KX_BlenderPolyMaterial & GPC_PolygonMaterial...
2004-05-26 Kester MaddockFix Bug #1309 Disabling Actor leaves Ghost, Dynamic...
2004-03-22 Nathan Letwory[GameEngine] Commit all Kester's changes made to the...
2002-11-25 Kent MeinLast of the config.h mods...
2002-10-12 Hans LambermontInitial revision v2.25