-
- Downloads
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
Showing
- CMakeLists.txt 95 additions, 80 deletionsCMakeLists.txt
- config/linuxcross-config.py 1 addition, 1 deletionconfig/linuxcross-config.py
- config/win32-mingw-config.py 1 addition, 1 deletionconfig/win32-mingw-config.py
- intern/ghost/GHOST_ISystem.h 1 addition, 1 deletionintern/ghost/GHOST_ISystem.h
- intern/ghost/intern/GHOST_System.cpp 4 additions, 5 deletionsintern/ghost/intern/GHOST_System.cpp
- intern/ghost/intern/GHOST_System.h 2 additions, 2 deletionsintern/ghost/intern/GHOST_System.h
- source/blender/editors/interface/interface_handlers.c 14 additions, 15 deletionssource/blender/editors/interface/interface_handlers.c
- source/blender/editors/sound/sound_ops.c 41 additions, 1 deletionsource/blender/editors/sound/sound_ops.c
- source/blender/editors/space_view3d/view3d_edit.c 2 additions, 2 deletionssource/blender/editors/space_view3d/view3d_edit.c
- source/blender/makesdna/DNA_object_types.h 0 additions, 1 deletionsource/blender/makesdna/DNA_object_types.h
- source/blender/makesrna/intern/rna_object.c 0 additions, 3 deletionssource/blender/makesrna/intern/rna_object.c
- source/blender/python/generic/blf_api.c 1 addition, 1 deletionsource/blender/python/generic/blf_api.c
- source/blender/windowmanager/wm_event_types.h 1 addition, 1 deletionsource/blender/windowmanager/wm_event_types.h
- source/gameengine/Converter/BL_BlenderDataConversion.cpp 1 addition, 8 deletionssource/gameengine/Converter/BL_BlenderDataConversion.cpp
- source/gameengine/Converter/KX_BlenderSceneConverter.cpp 52 additions, 66 deletionssource/gameengine/Converter/KX_BlenderSceneConverter.cpp
- source/gameengine/Converter/KX_BlenderSceneConverter.h 1 addition, 1 deletionsource/gameengine/Converter/KX_BlenderSceneConverter.h
- source/gameengine/GamePlayer/ghost/GPG_Application.cpp 9 additions, 14 deletionssource/gameengine/GamePlayer/ghost/GPG_Application.cpp
- source/gameengine/GamePlayer/ghost/GPG_Application.h 5 additions, 5 deletionssource/gameengine/GamePlayer/ghost/GPG_Application.h
- source/gameengine/GamePlayer/ghost/GPG_ghost.cpp 5 additions, 14 deletionssource/gameengine/GamePlayer/ghost/GPG_ghost.cpp
- source/gameengine/Ketsji/CMakeLists.txt 0 additions, 4 deletionssource/gameengine/Ketsji/CMakeLists.txt
Loading
Please register or sign in to comment