aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Carbonetto2017-07-27 13:15:59 -0500
committerPeter Carbonetto2017-07-27 13:15:59 -0500
commit5fc26ee16f6f4ad5a80524cc3ef8e23d115b7c20 (patch)
tree6154c944e0bbf5cd20e3f0bd2f5c7a74ce46b33d
parentedda3b949f4b9a134f8a44df8029d2f8466a5035 (diff)
parentb39da052c68c8bf567b6e88b7e6e8ef0620b14c7 (diff)
downloadpangemma-5fc26ee16f6f4ad5a80524cc3ef8e23d115b7c20.tar.gz
Merge branch 'master' of github.com:genetics-statistics/GEMMA.
-rw-r--r--Makefile.linux2
-rw-r--r--Makefile.macosx2
-rw-r--r--src/gemma.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.linux b/Makefile.linux
index 303a8fb..e1e76eb 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -16,7 +16,7 @@ SYS = LNX
WITH_LAPACK = 1
FORCE_32BIT =
FORCE_DYNAMIC =
-DIST_NAME = gemma-0.96alpha
+DIST_NAME = gemma-0.97
# --------------------------------------------------------------------
# Edit below this line with caution
diff --git a/Makefile.macosx b/Makefile.macosx
index 00467d6..7e93a85 100644
--- a/Makefile.macosx
+++ b/Makefile.macosx
@@ -16,7 +16,7 @@ SYS = MAC
WITH_LAPACK = 1
FORCE_32BIT =
FORCE_DYNAMIC = 1
-DIST_NAME = gemma-0.96
+DIST_NAME = gemma-0.97
# --------------------------------------------------------------------
# Edit below this line with caution
diff --git a/src/gemma.cpp b/src/gemma.cpp
index f4902fe..1a9ca9b 100644
--- a/src/gemma.cpp
+++ b/src/gemma.cpp
@@ -48,7 +48,7 @@
using namespace std;
GEMMA::GEMMA(void):
-version("0.97"), date("07/07/2017"), year("2017")
+version("0.97"), date("07/27/2017"), year("2017")
{}
void GEMMA::PrintHeader (void) {