summaryrefslogtreecommitdiffstats
path: root/src/version.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2013-05-16 23:23:29 (GMT)
committerEvan Martin <martine@danga.com>2013-05-16 23:23:29 (GMT)
commitddb21217f90e2fc6639d68b240ad2fc394b2dc6c (patch)
treeb72aa49307eb6d4e9fd0781ae3202261b127c4e8 /src/version.cc
parentd0d199e99fe6648c3994ecbbe0c7927065b22d16 (diff)
parent31ef1415f208e04000424e6fc446fe4377bc7ed3 (diff)
downloadNinja-ddb21217f90e2fc6639d68b240ad2fc394b2dc6c.zip
Ninja-ddb21217f90e2fc6639d68b240ad2fc394b2dc6c.tar.gz
Ninja-ddb21217f90e2fc6639d68b240ad2fc394b2dc6c.tar.bz2
Merge branch 'master' into release
Diffstat (limited to 'src/version.cc')
-rw-r--r--src/version.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/version.cc b/src/version.cc
index 45fb040..07167fe 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -18,7 +18,7 @@
#include "util.h"
-const char* kNinjaVersion = "1.2.0";
+const char* kNinjaVersion = "1.3.0";
void ParseVersion(const string& version, int* major, int* minor) {
size_t end = version.find('.');
@@ -51,7 +51,3 @@ void CheckNinjaVersion(const string& version) {
kNinjaVersion, version.c_str());
}
}
-
-
-
-