svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.4 -r23172...
authorCampbell Barton <ideasman42@gmail.com>
Sun, 13 Sep 2009 08:50:54 +0000 (08:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 13 Sep 2009 08:50:54 +0000 (08:50 +0000)
commitf9694287d9a9a2ca5d031d6fbf4aa05045944ecc
treefce5ed31decd6cd98aa25d3a35e1c116b98bcd6a
parent7eea0b647cbfa7cadec14b07b696bf10830189e8
svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.4 -r23172:HEAD

merging now to save confusion later since the changes between last merge and 23172 shouldn't be merged.

brings 2.4 and trunk in sync aside from sequencer edits from Peter.
source/blender/imbuf/intern/jp2.c
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.h