Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

..

bmesh

incorrect spelling in comments

2012-09-26 20:05:38 +00:00

generic

code cleanup: correct spelling

2012-09-28 06:45:20 +00:00

intern

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +00:00

mathutils

incorrect spelling in comments

2012-09-26 20:05:38 +00:00

BPY_extern.h

Python/context: python could get invalid bpy.data in scene update handler after

2012-05-08 22:07:06 +00:00

CMakeLists.txt

initial bmesh python api.

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

rna_dump.py

Code Cleanup: check is / is not when comparing singletons.

2012-02-02 21:07:56 +00:00

SConscript

Merged changes in the trunk up to revision 46557.

2012-05-11 22:48:41 +00:00

simple_enum_gen.py

style cleanup: py/capi

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