commit 6d5a4b9eb973e9d82d63f8f9a421fad97d20e6d0
author Jan Niklas Hasse <jhasse@bixense.com> Wed Jan 30 19:57:52 2019 +0100
committer Jan Niklas Hasse <jhasse@bixense.com> Wed Jan 30 19:57:52 2019 +0100
tree b427025388b026f169a135343c8a275379314127
parent 253e94c1fa511704baeb61cf69995bbf09ba435e
parent 0c158431f30a14d771e5c82c1e69eff7c69a08ce

Merge branch 'master' into release

doc/manual.asciidoc

diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 3440740..3c42aa7 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -1,5 +1,6 @@
 The Ninja build system
 ======================
+v1.8.2, Sep 2017
 
 
 Introduction

src/version.cc

diff --git a/src/version.cc b/src/version.cc
index 1c906ae..bda25be 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -18,7 +18,7 @@
 
 #include "util.h"
 
-const char* kNinjaVersion = "1.9.0.git";
+const char* kNinjaVersion = "1.9.0";
 
 void ParseVersion(const string& version, int* major, int* minor) {
   size_t end = version.find('.');