summaryrefslogtreecommitdiff
path: root/wx+/grid.h
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2021-02-02 21:49:34 +0000
committerB Stack <bgstack15@gmail.com>2021-02-02 21:49:34 +0000
commit26b8bd6eb07b78adad36049e03494a2931b231af (patch)
tree4d7c950512836f473a6a8cbb521c61e800db6584 /wx+/grid.h
parentMerge branch '11.5' into 'master' (diff)
parentadd upstream 11.6 (diff)
downloadFreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.tar.gz
FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.tar.bz2
FreeFileSync-26b8bd6eb07b78adad36049e03494a2931b231af.zip
Merge branch '11.6' into 'master'11.6
add upstream 11.6 See merge request opensource-tracking/FreeFileSync!30
Diffstat (limited to 'wx+/grid.h')
-rw-r--r--wx+/grid.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/wx+/grid.h b/wx+/grid.h
index 83b06c63..8d68ffd7 100644
--- a/wx+/grid.h
+++ b/wx+/grid.h
@@ -12,7 +12,7 @@
#include <optional>
#include <set>
#include <vector>
-#include <zen/basic_math.h>
+//#include <zen/basic_math.h>
#include <wx/scrolwin.h>
bgstack15