Mercurial > hg > orthanc-stone

changeset 530:64782d018fc4 bgo-commands-codegen

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged am-touch-events
author Benjamin Golinvaux <bgo@osimis.io>
date Sun, 17 Mar 2019 20:16:21 +0100
parents 7b29a8599318 (current diff) 2549363fadc3 (diff)
children 32dc5af8ab99
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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/
--- 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