Merged changes in the trunk up to revision 30060.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 6 Jul 2010 23:39:10 +0000 (23:39 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 6 Jul 2010 23:39:10 +0000 (23:39 +0000)
1  2 
release/scripts/ui/space_userpref.py
source/blender/editors/space_outliner/outliner.c

Simple merge