Merging from the master branch.

2017-12-19 02:47:08 +01:00 · 2017-12-19 02:47:08 +01:00 · b2c176730a
commit b2c176730a
parent c0b14acd31 43061665f5
325 changed files with 13191 additions and 20223 deletions
--- a/src/onscreen_keyboard.c
+++ b/src/onscreen_keyboard.c
@ -1,6 +1,3 @@
-#ifdef __APPLE__
-#include "patch.h"              //EP
-#endif
 #include "onscreen_keyboard.h"

 #define DEBUG_OSK_COMPOSEMAP