Tamito Kajiyama 4e0b1d9177 Merged changes in the trunk up to revision 39368. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py

2011-08-13 23:29:16 +00:00

..

buildbot

use correct libdir for buildbot win64.

2011-08-11 16:43:36 +00:00

cmake

add missing header to cmake files (else some IDE's wont index it)

2011-08-08 05:43:04 +00:00

package_spec

patch from Dan Eicher for cpack rpms

2011-05-10 21:59:11 +00:00

scons

Merged changes in the trunk up to revision 39368.

2011-08-13 23:29:16 +00:00