Context Navigation

btTriangleIndexVertexMaterialArray.cpp

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

Property svn:mergeinfo changed

/code/branches/kicklib	merged: 7979-7984,8057-8058,8061-8064,8066-8068,8071,8073-8074,8080-8082,8089,8094-8096
/code/branches/mac_osx (added)	merged: 7789,7933-7934,8042-8049,8054-8056,8059-8060,8065,8069-8070,8072
/code/branches/ois_update (added)	merged: 7506-7528,7530,7532,7553,7557-7560,7562-7564,7567,7570-7572,7575-7578,7582,7591-7592,7615,7618-7624,7660,7664,7669,7681-7683,7691,7701,7719,7767,7771,7782

-                      r5781
+                      r8284
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
 Permission is granted to anyone to use this software for any purpose,
 including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:

Note: See TracChangeset for help on using the changeset viewer.