# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1552850181 -3600
# Node ID 64782d018fc456c9fa2d2c164a695471e31a7b2a
# Parent  7b29a85993185c79aed99585c72568c1a5d87312# Parent  2549363fadc37666bfa23b60a3558b702819b464
Merged am-touch-events

diff -r 7b29a8599318 -r 64782d018fc4 .hgignore
--- a/.hgignore	Sun Mar 17 20:15:12 2019 +0100
+++ b/.hgignore	Sun Mar 17 20:16:21 2019 +0100
@@ -1,5 +1,6 @@
 CMakeLists.txt.user
 Platforms/Generic/ThirdPartyDownloads/
+Applications/build-*
 Applications/Qt/archive/
 Applications/Samples/ThirdPartyDownloads/
 Applications/Samples/build-wasm/
diff -r 7b29a8599318 -r 64782d018fc4 Applications/StoneApplicationContext.h
--- a/Applications/StoneApplicationContext.h	Sun Mar 17 20:15:12 2019 +0100
+++ b/Applications/StoneApplicationContext.h	Sun Mar 17 20:16:21 2019 +0100
@@ -38,7 +38,7 @@
 /* Test for GCC > 3.2.0 */
   #if GCC_VERSION > 40900
     #define orthanc_override override
-  else
+  #else
     #define orthanc_override
   #endif
 #else