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)
commit336ae14ba9e208a86ce3f65385af467d8535f643
tree6e93ebf82056dc545e4178a41d592a3b1454ed12
parentd7aad3559914cc869d0bff92c4394eb0df17caa3
parent17296efd62ff37f0f6f5ae812c3009baaa2c54a1
merging trunk 17221:17300
source/blender/src/buttons_editing.c