Showing with 1 addition and 2 deletions.

+1 −1 cmake/travis.sh

+0 −1 src/libkstmath/plottickcalculator.cpp
diff --git a/cmake/travis.sh b/cmake/travis.sh
@@ -298,7 +298,7 @@ fi
 
 $cmakebin ../kst \
     -Dkst_release=1  \
-    -Dkst_merg_files=1 \
+    -Dkst_merge_files=1 \
     -Dkst_version_string=$versionname \
     -Dkst_install_prefix=./$versionname \
     -Dkst_cross=$compiler \

diff --git a/src/libkstmath/plottickcalculator.cpp b/src/libkstmath/plottickcalculator.cpp
@@ -14,7 +14,6 @@
 
 #include <QtGlobal>
 #include <math.h>
-#include <cmath>
 
 namespace Kst {