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

..

freestyle

Added header comments to indicate the author(s) of original files.

2013-03-24 00:53:05 +00:00

modules

code cleanup: python/pep8 and double-promotion warnings.

2013-03-28 19:33:14 +00:00

presets

code cleanup: pep8 & minor changes

2013-03-11 02:19:58 +00:00

startup

Merged changes in the trunk up to revision 55700.

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

templates_osl

OSL Templates: remove unnecessary stdosl.h include.

2012-12-30 10:37:32 +00:00

templates_py

Merged changes in the trunk up to revision 55546.

2013-03-24 12:13:13 +00:00