Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c

2012-12-01 02:47:59 +00:00

..

include

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

raytrace

code cleanup: spelling,

2012-11-12 07:33:01 +00:00

source

Merged changes in the trunk up to revision 52690.

2012-12-01 02:47:59 +00:00