svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
authorMike Erwin <significant.bit@gmail.com>
Tue, 2 Aug 2011 01:01:56 +0000 (01:01 +0000)
committerMike Erwin <significant.bit@gmail.com>
Tue, 2 Aug 2011 01:01:56 +0000 (01:01 +0000)
1  2 
CMakeLists.txt
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemWin32.cpp
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform.c

diff --cc CMakeLists.txt
Simple merge
index 2a3eb74d1e20dcc3dc9dd21dfe871c1206379369,95b3456ce3bca4ad45e9a2f507209f2979353c84..1b43fa92bb26771d0d0d2567e5ec367c43da22c6
  #include "GHOST_SystemWin32.h"
  #include "GHOST_EventDragnDrop.h"
  
 -#define WIN32_LEAN_AND_MEAN
 -#ifdef _WIN32_IE
 -#undef _WIN32_IE
 +#ifndef _WIN32_IE
 +#define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional requirements */
  #endif
 -#define _WIN32_IE 0x0501
 -#include <windows.h>
  #include <shlobj.h>
+ #include <tlhelp32.h>
  
  // win64 doesn't define GWL_USERDATA
  #ifdef WIN32