merge from trunk - r17500 to HEAD
authorCampbell Barton <ideasman42@gmail.com>
Wed, 10 Dec 2008 09:45:48 +0000 (09:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 10 Dec 2008 09:45:48 +0000 (09:45 +0000)
commit2ef5af67ca4075b16edd112788420d338f5b5e41
tree1e96816720714d81b3781449ee3a4082aa7fd7ff
parentce5b9d21a76128dc01225c9dd5fa8f99d53e4a37
parent2f39ae3b2eb2a5051746843b5f43a9f89d4576d6
merge from trunk - r17500 to HEAD
source/blender/include/butspace.h
source/blender/src/buttons_editing.c
source/blender/src/space.c