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

..

build_environment

Use same opencollada rev as windows' libs.

2013-03-28 20:24:36 +00:00

buildbot

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

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

cmake

correct too-big allocation in mesh beautify.

2013-04-01 07:57:33 +00:00

package_spec

Add datafiles/locale/languages to blender.spec.in for CPack

2012-12-28 23:30:34 +00:00

scons

Merged changes in the trunk up to revision 55700.

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