Notes: * blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
#ifdef HAVE_CONFIG_H #include <config.h> #endif added to these files. Kent -- mein@cs.umn.edu