Tamito Kajiyama 94ae0232b0 Merged changes in the trunk up to revision 53729. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c

2013-01-12 02:02:53 +00:00

..

bmesh

Merged changes in the trunk up to revision 53729.

2013-01-12 02:02:53 +00:00

generic

style cleanup

2013-01-09 03:30:15 +00:00

intern

Merged changes in the trunk up to revision 53729.

2013-01-12 02:02:53 +00:00

mathutils

replace MIN/MAX 3,4 with inline functions

2012-12-21 05:07:26 +00:00

BPY_extern.h

code cleanup: warnings and use stdbool for bpy* funcs.

2013-01-07 05:26:12 +00:00

CMakeLists.txt

initial bmesh python api.

2012-02-22 09:19:53 +00:00

rna_dump.py

style cleanup: pep8

2012-10-08 10:03:01 +00:00

SConscript

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

simple_enum_gen.py

style cleanup: py/capi

2012-03-16 21:39:56 +00:00