projects / blender-staging.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6611d9 8597925)
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 patch | diff1 | diff2 | blob | history
config/win32-vc-config.py patch | diff1 | diff2 | blob | history

diff --cc config/linux2-config.py
Simple merge
diff --cc config/win32-vc-config.py
Simple merge
Repository to test new patches