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

..

buildinfo.c

style cleanup: mostly whitespace in rna

2012-05-12 11:01:29 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 50956.

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

creator.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00