merging trunk 17485:17520
authorMartin Poirier <theeth@yahoo.com>
Thu, 20 Nov 2008 21:57:21 +0000 (21:57 +0000)
committerMartin Poirier <theeth@yahoo.com>
Thu, 20 Nov 2008 21:57:21 +0000 (21:57 +0000)
1  2 
source/blender/src/buttons_editing.c

Simple merge