Tamito Kajiyama 5524ed9ba2 Merged changes in the trunk up to revision 55700. ...

Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h

2013-04-01 13:47:19 +00:00

..

include

Merging r55547 through r55594 from trunk into soc-2008-mxcurioni

2013-03-26 09:09:31 +00:00

raytrace

style cleanup:

2013-03-26 07:29:01 +00:00

source

Merged changes in the trunk up to revision 55700.

2013-04-01 13:47:19 +00:00