reverting previous commit from Mitchell. His commit went to the trunk instead of...
authorDalai Felinto <dfelinto@gmail.com>
Sat, 29 May 2010 21:31:57 +0000 (21:31 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Sat, 29 May 2010 21:31:57 +0000 (21:31 +0000)
commitc6bec43330be0874b4116d259bbaf9fb90ed0556
treea1de833c9b4067a0659461ce8af20857678034ed
parent9d3157eed000e7c543d04f5ad3efc5990675903b
reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
29 files changed:
CMakeLists.txt
config/linuxcross-config.py
config/win32-mingw-config.py
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_System.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/python/generic/blf_api.c
source/blender/windowmanager/wm_event_types.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.h
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/SConscript
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/common/PHY_DynamicTypes.h
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_2DFilterManager.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp