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

..

include

Merged changes in the trunk up to revision 53584.

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

raytrace

style cleanup

2013-01-07 03:24:22 +00:00

source

Merged changes in the trunk up to revision 53729.

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