Bumped version to 1.3

diff --git a/.gitignore b/.gitignore
index 2a37d976dd5bd0fb83e3dc3f53b97767618c64a0..1d19e6a009abad3c5e312651513049216acdbf5b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ reservoir_sample
 ._*
 .DS_Store
 .DS_Store?
+test/*_test

diff --git a/Makefile b/Makefile
index b335a02a28e34d6c74422923468fa1fc11640070..e1b5ff8dd0b14a3eb5ebaec2ec83c70614aae599 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 #!make
 
-ifeq "$(origin CC)" "default"
-CC = clang
-endif
+#ifeq "$(origin CC)" "default"
+#CC = clang
+#endif
 
 CFLAGS += -g -Wall -Wextra
 CFLAGS += -O3

diff --git a/version.h b/version.h
index 73e992ed17fb6e6e15f733cbe90ac4c729b24dd7..8b5244bd15c3f5d31f45b0c29fe3a7164071f51b 100644 (file)
--- a/version.h
+++ b/version.h
@@ -2,9 +2,9 @@
 #define VERSION_H
 
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 2
-#define VERSION_EXTRA_STR "1"
-#define VERSION_STR "1.2-1"
-#define VERSION_DATE  "2013-02-22"
+#define VERSION_MINOR 3
+#define VERSION_EXTRA_STR ""
+#define VERSION_STR "1.3"
+#define VERSION_DATE  "2013-02-26"
 
 #endif