Merge -c 26209,26214,26443 from COLLADA branch into trunk.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 30 Jan 2010 18:20:56 +0000 (18:20 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 30 Jan 2010 18:20:56 +0000 (18:20 +0000)
1  2 
config/linux2-config.py
config/win32-vc-config.py

Simple merge
Simple merge