Cycles: svn merge -r39132:39457 https://svn.blender.org/svnroot/bf-blender/trunk/blender

CMakeLists.txt

GNUmakefile

SConstruct

build_files/buildbot/master.cfg

build_files/buildbot/slave_compile.py

build_files/buildbot/slave_pack.py

build_files/cmake/config/blender_headless.cmake

build_files/cmake/config/blender_lite.cmake

build_files/cmake/config/bpy_module.cmake

build_files/cmake/macros.cmake

build_files/scons/config/darwin-config.py

build_files/scons/tools/btools.py

doc/doxygen/Doxyfile

doc/python_api/rst/bge.logic.rst

intern/ghost/CMakeLists.txt

intern/ghost/intern/GHOST_NDOFManager.cpp

intern/ghost/intern/GHOST_NDOFManagerCocoa.h

intern/ghost/intern/GHOST_NDOFManagerCocoa.mm

intern/ghost/intern/GHOST_NDOFManagerX11.cpp

intern/ghost/intern/GHOST_NDOFManagerX11.h