svn merge -r 13452:14721 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 7 May 2008 17:44:46 +0000 (17:44 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 7 May 2008 17:44:46 +0000 (17:44 +0000)
commit57932e1752ea0d9b9b0f3f69327bca83297d7e07
tree0ee57c9d36089c68113e0db92fa2b8c915c5bf14
parent2f4ca518ea468f6c2e06a70aa24f16cf8a141425
parent529a8bb949412ac5cc7203fd583e4f0b28282ddf
svn merge -r 13452:14721 https://svn.blender.org/svnroot/bf-blender/trunk/blender
15 files changed:
CMakeLists.txt
extern/bullet2/src/BulletDynamics/CMakeLists.txt
release/datafiles/splash.jpg
source/Makefile
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle.c
source/blender/include/BIF_imasel.h
source/blender/include/BSE_drawview.h
source/blender/include/BSE_filesel.h
source/blender/src/space.c
source/blender/src/splash.jpg.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h