« back to all changes in this revision
Viewing changes to source/blender/blenkernel/intern/collision.c
- Committer: Bazaar Package Importer
- Date: 2009-08-06 22:32:19 UTC
- mfrom: (1.2.10 upstream)
- Revision ID: james.westby@ubuntu.com-20090806223219-8z4eej1u8levu4pz
* Merge from debian unstable, remaining changes:
- debian/control: Build-depend on python-2.6 rather than python-2.5.
- debian/misc/*.desktop: Add Spanish translation to .desktop
files.
- debian/pyversions: 2.6.
- debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
- 01_sanitize_sys.patch
- 02_tmp_in_HOME
- 10_use_systemwide_ftgl
- 70_portability_platform_detection
* Removed patches merged upstream:
- 30_fix_python_syntax_warning
- 90_ubuntu_ffmpeg_52_changes
- debian/control: Build-depend on python-2.6 rather than python-2.5.
- debian/misc/*.desktop: Add Spanish translation to .desktop
files.
- debian/pyversions: 2.6.
- debian/rules: Clean *.o of source/blender/python/api2_2x/
* New upstream release (LP: #382153).
* Refreshed patches:
- 01_sanitize_sys.patch
- 02_tmp_in_HOME
- 10_use_systemwide_ftgl
- 70_portability_platform_detection
* Removed patches merged upstream:
- 30_fix_python_syntax_warning
- 90_ubuntu_ffmpeg_52_changes
- files added:
- config/irix6-config.py
- extern/bullet2/make/msvc_9_0
- extern/glew/make/msvc_9_0
- extern/make/msvc_9_0
- extern/qhull/make/msvc_9_0
- extern/solid/make/msvc_9_0
- extern/solid/make/msvc_9_0/broad
- extern/solid/make/msvc_9_0/complex
- extern/solid/make/msvc_9_0/convex
- extern/verse/make/msvc_9_0
- intern/SoundSystem/make/msvc_9_0
- intern/SoundSystem/make/msvc_9_0/dummy
- intern/SoundSystem/make/msvc_9_0/openal
- intern/bmfont/make/msvc_9_0
- intern/boolop/make/msvc_9_0
- intern/bsp/make/msvc_9_0
- intern/container/make/msvc_9_0
- intern/decimation/make/msvc_9_0
- intern/elbeem/make/msvc_9_0
- intern/ghost/make/msvc_9_0
- intern/guardedalloc/make/msvc_9_0
- intern/iksolver/make/msvc_9_0
- intern/make/msvc_9_0
- intern/memutil/make/msvc_9_0
- intern/moto/make/msvc_9_0
- intern/opennl/make/msvc_9_0
- intern/string/make/msvc_9_0
- projectfiles_vc7/gameengine/videotexture
- projectfiles_vc9
- projectfiles_vc9/blender
- projectfiles_vc9/blender/BLO_readblenfile
- projectfiles_vc9/blender/BPY_python
- projectfiles_vc9/blender/avi
- projectfiles_vc9/blender/blenkernel
- projectfiles_vc9/blender/blenlib
- projectfiles_vc9/blender/blenpluginapi
- projectfiles_vc9/blender/blenpluginapi/blenpluginapi
- projectfiles_vc9/blender/ftfont
- projectfiles_vc9/blender/gpu
- projectfiles_vc9/blender/imbuf
- projectfiles_vc9/blender/img
- projectfiles_vc9/blender/loader
- projectfiles_vc9/blender/makesdna
- projectfiles_vc9/blender/nodes
- projectfiles_vc9/blender/radiosity
- projectfiles_vc9/blender/render
- projectfiles_vc9/blender/renderconverter
- projectfiles_vc9/blender/src
- projectfiles_vc9/blender/yafray
- projectfiles_vc9/gameengine
- projectfiles_vc9/gameengine/blenderhook
- projectfiles_vc9/gameengine/converter
- projectfiles_vc9/gameengine/expression
- projectfiles_vc9/gameengine/gamelogic
- projectfiles_vc9/gameengine/gameplayer
- projectfiles_vc9/gameengine/gameplayer/axctl
- projectfiles_vc9/gameengine/gameplayer/common
- projectfiles_vc9/gameengine/gameplayer/ghost
- projectfiles_vc9/gameengine/ketsji
- projectfiles_vc9/gameengine/ketsji/network
- projectfiles_vc9/gameengine/network
- projectfiles_vc9/gameengine/network/loopbacknetwork
- projectfiles_vc9/gameengine/network/network
- projectfiles_vc9/gameengine/physics
- projectfiles_vc9/gameengine/physics/PHY_Physics
- projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet
- projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Dummy
- projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Ode
- projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Sumo
- projectfiles_vc9/gameengine/rasterizer
- projectfiles_vc9/gameengine/rasterizer/openglrasterizer
- projectfiles_vc9/gameengine/scenegraph
- projectfiles_vc9/gameengine/videotexture
- projectfiles_vc9/kernel
- projectfiles_vc9/kernel/gen_messaging
- projectfiles_vc9/kernel/system
- projectfiles_vc9/sumo
- scons
- scons/scons-local-1.1.0
- scons/scons-local-1.1.0/SCons
- scons/scons-local-1.1.0/SCons/Node
- scons/scons-local-1.1.0/SCons/Options
- scons/scons-local-1.1.0/SCons/Platform
- scons/scons-local-1.1.0/SCons/Scanner
- scons/scons-local-1.1.0/SCons/Script
- scons/scons-local-1.1.0/SCons/Tool
- scons/scons-local-1.1.0/SCons/Tool/packaging
- scons/scons-local-1.1.0/SCons/Variables
- scons/scons-local-1.1.0/SCons/compat
- source/blender/nodes/intern/TEX_nodes
- source/gameengine/VideoTexture
- files removed:
- ChangeLog
- extern/libopenjpeg
- extern/libopenjpeg/patches
- intern/SoundSystem/fmod
- files modified:
- CMake/macros.cmake
added
removed
source/blender/blenkernel/intern/collision.c
