summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ninja.cc4
-rw-r--r--src/version.cc2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ninja.cc b/src/ninja.cc
index 9529a50..69646e1 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -49,10 +49,6 @@ int MSVCHelperMain(int argc, char** argv);
namespace {
-/// The version number of the current Ninja release. This will always
-/// be "git" on trunk.
-const char* kVersion = "1.2.0";
-
/// Global information passed into subtools.
struct Globals {
Globals() : state(new State()) {}
diff --git a/src/version.cc b/src/version.cc
index b3a93d1..45fb040 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -18,7 +18,7 @@
#include "util.h"
-const char* kNinjaVersion = "1.1.0.git";
+const char* kNinjaVersion = "1.2.0";
void ParseVersion(const string& version, int* major, int* minor) {
size_t end = version.find('.');