svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/blender soc-2010-nicks
authorBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 19:30:33 +0000 (19:30 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 19:30:33 +0000 (19:30 +0000)
commit673552502bb2af1d78653bd7ce5a91e08403f41f
tree9af2a20a2cfc602af472a06210be2f6c2094494c
parentca170a8ed6745da4f9de5d2f5a1544571a2df783
parent4b1a8d62e1b8f575bec87d12afc4d367468c1002
svn merge -r 40061:40078 https://svn.blender.org/svnroot/bf-blender/trunk/blender