Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 30 May 2008 20:33:33 +0000 (20:33 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Fri, 30 May 2008 20:33:33 +0000 (20:33 +0000)
svn merge  -r 14954:15064 https://svn.blender.org/svnroot/bf-blender/trunk/blender

1  2 
source/blender/blenkernel/intern/modifier.c
source/blender/src/buttons_editing.c

Simple merge