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)
1  2 
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c

index c4a07a004d203d6602465c671b5e3bc47bb434e5,25dbb68a25872a1d38aaf789ceec5aead19ffa86..975093bd877ce7f9a5178e6a59db7fe408cbaa78
@@@ -33,7 -33,7 +33,8 @@@
  
  #include "MEM_guardedalloc.h"
  
 +#include "DNA_anim_types.h"
+ #include "DNA_key_types.h"
  #include "DNA_scene_types.h"
  #include "DNA_userdef_types.h"