merging trunk 17221:17300
authorMartin Poirier <theeth@yahoo.com>
Sun, 2 Nov 2008 19:44:18 +0000 (19:44 +0000)
committerMartin Poirier <theeth@yahoo.com>
Sun, 2 Nov 2008 19:44:18 +0000 (19:44 +0000)
1  2 
source/blender/src/buttons_editing.c

Simple merge