Tamito Kajiyama 003ab20292 Merged changes in the trunk up to revision 35618. ...

Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c

2011-03-19 00:05:30 +00:00

..

blender

Merged changes in the trunk up to revision 35618.

2011-03-19 00:05:30 +00:00

blenderplayer

blenderplayer building again in CMake + OSX (and Linux I guess) patch from IRIE Shinsuke

2011-03-05 09:27:14 +00:00

creator

Merged changes in the trunk up to revision 35618.

2011-03-19 00:05:30 +00:00

darwin

Mac OS X cmake changes and bundle fixes

2011-03-16 15:44:17 +00:00

gameengine

BGE PhysicsConstraints.exportBulletFile improvement: also export the object names to .bullet files.

2011-03-16 21:20:24 +00:00

icons

remove nan-makefiles

2011-01-30 15:29:22 +00:00

kernel

doxygen: kernel/gen_system tagged.

2011-02-25 13:25:53 +00:00

tests

remove cmake WITH_INSTALL option since its a target now.

2011-03-16 21:32:20 +00:00

CMakeLists.txt

- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

2011-01-23 11:42:29 +00:00

SConscript

…