Tamito Kajiyama 66a2b84897 Merged changes in the trunk up to revision 54992. ...

Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py

2013-03-03 15:07:49 +00:00

..

build_environment

install_deps.sh:

2013-02-24 11:54:28 +00:00

buildbot

Cycles GPU rendering:

2013-02-21 17:14:07 +00:00

cmake

add PHY headers to cmake's ketsji (else some IDE's won't show)

2013-02-26 23:08:42 +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 54802.

2013-02-24 03:39:20 +00:00