[Bf-blender-cvs] [1087b92] input_method_editor: Merge branch master into input_method_editor

[Severin]

Commit: 1087b9236f5c42f5c497bd5d62787a55f64ebb69
Author: Severin
Date:   Mon Nov 24 00:27:36 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB1087b9236f5c42f5c497bd5d62787a55f64ebb69

Merge branch master into input_method_editor

===================================================================

M	intern/ghost/CMakeLists.txt

===================================================================

diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 9cc8ff3..8f30564 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -264,14 +264,12 @@ elseif(WIN32)
 		intern/GHOST_SystemWin32.cpp
 		intern/GHOST_WindowWin32.cpp
 		intern/GHOST_DropTargetWin32.cpp
-		intern/GHOST_ImeWin32.cpp
 
 		intern/GHOST_DisplayManagerWin32.h
 		intern/GHOST_DropTargetWin32.h
 		intern/GHOST_SystemWin32.h
 		intern/GHOST_WindowWin32.h
 		intern/GHOST_TaskbarWin32.h
-		intern/GHOST_ImeWin32.h
 	)
 
 	if(NOT WITH_GL_EGL)