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)
commit0f3e985aca18a514ad59b54007781a63f22c74eb
tree93bb834bd67112e5fa6f57d8f3a8543d48f64f78
parent9bb9859753a18d9a72ac0cb482a765c4e40f4676
parent520a5b0926c6049a2e13f050bd21536a180b402b
merging trunk 17485:17520
source/blender/src/buttons_editing.c