Some small fixed in the opengl version

src/examples/swe_opengl.cpp

@@ -33,14 +33,9 @@
 // Display settings
 #define SCREEN_WIDTH 800
 #define SCREEN_HEIGHT 600
-<<<<<<< Updated upstream
 #define WINDOW_TITLE "Shallow Water Equations v1.3"
-=======
-// Number of nodes (not cells) of grid
 #define GRID_XSIZE 401
 #define GRID_YSIZE 401
-#define WINDOW_TITLE "Shallow Water Equations v1.2"
->>>>>>> Stashed changes
 
 /**
 	Main routine.

src/opengl/shader.cpp

@@ -18,6 +18,8 @@
 // along with SWE_CUDA.  If not, see <http://www.gnu.org/licenses/>.
 // =====================================================================
 
+#include <unistd.h>
+
 #include "shader.h"
 
 #include "tools/Logger.hh"

src/opengl/text.h

@@ -20,6 +20,8 @@
 #ifndef TEXT_H
 #define TEXT_H
 
+#include <unistd.h>
+
 #include <cmath>
 #include <string>
 #include <vector>