Merge from trunk -r 25003:25745.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 5 Jan 2010 19:21:59 +0000 (19:21 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Tue, 5 Jan 2010 19:21:59 +0000 (19:21 +0000)
commit1bca8389dd979e669ed9f26ba876939b540dab66
tree2a7f8447ea8166de6b08cc6719974d143b02d0ef
parent06d548bd6fdb9d3e4fc99ecf3b26617648e6b73c
parent73f84b24fca541caa4aaec02d946b887ddfb216b
Merge from trunk -r 25003:25745.
CMakeLists.txt
config/linux2-config.py
config/win32-vc-config.py
config/win64-vc-config.py
source/blender/collada/DocumentExporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/windowmanager/intern/wm_operators.c