svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . merwin-spacenav
authorMike Erwin <significant.bit@gmail.com>
Tue, 2 Aug 2011 01:01:56 +0000 (01:01 +0000)
committerMike Erwin <significant.bit@gmail.com>
Tue, 2 Aug 2011 01:01:56 +0000 (01:01 +0000)
commitdc2609da3d08ff2dde1747201ef4e0ebb17d5bd9
treeb18b8fa9a8eba6a9de70514def129b53f4733aaa
parent19b38034f989089e359b9a4ea1e65fcbe8ffa18c
parentc965d1d2ccfd57926476cb5c091afa35c6de217f
svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
CMakeLists.txt
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemWin32.cpp
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform.c