Merging trunk up to r38193.
authorJoerg Mueller <nexyon@gmail.com>
Thu, 7 Jul 2011 16:34:19 +0000 (16:34 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Thu, 7 Jul 2011 16:34:19 +0000 (16:34 +0000)
commitc57ac39f7f0629a1ec73654664202637a07cb770
tree6d8242891139f56ae8863f021fab185c36a59b8b
parentc9d6989098e2defbaea36b767169f521c8a5d62a
parent99736f373c12e7ab91f962c738243bddf2d713c6
Merging trunk up to r38193.
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c