Merge trunk with branch
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 23 Apr 2008 13:06:53 +0000 (13:06 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 23 Apr 2008 13:06:53 +0000 (13:06 +0000)
commit149f7f07d23044c7ecce132a39eb1b36c7b750bb
treed17a58a61d455e6436eee55dbc2b016ae7b3eb92
parent087c66fd293c1921b4663c8c8b7bfc05cc117831
parent3552afeef2998b927ac5828a1904bd6c2d5034b6
Merge trunk with branch
svn merge -r 14521:head https://svn.blender.org/svnroot/bf-blender/trunk/blender