Merge trunk with branch
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 25 Apr 2008 18:28:59 +0000 (18:28 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 25 Apr 2008 18:28:59 +0000 (18:28 +0000)
commit7374d23b61a87d5ea62f845d88a542afb23209ee
tree20317755264fdca2574e4d5fb91f7f90184fc429
parenta0add959ff88c61a1f42c21de75c63bd4c25e87e
parent2a72b986d4dc8b6bef845e5ca9bdbb6bbf0ff8f4
Merge trunk with branch
svn merge -r 14529:14551 https://svn.blender.org/svnroot/bf-blender/trunk/blender