commit 5c2cde2f7e66b2928c2bcf33df4112850dad0af6
author Jan Niklas Hasse <jhasse@bixense.com> Tue Aug 18 21:25:45 2020 +0200
committer Jan Niklas Hasse <jhasse@bixense.com> Tue Aug 18 21:25:45 2020 +0200
tree 7787cd5aea4894b2a5018ae4c1a6b469d3e80ef7
parent ed7f67040b370189d989adbd60ff8ea29957231f
parent 9ddd3c917793bb97eb19d571429cdedf07501c03

Merge branch 'master' into release

doc/manual.asciidoc

diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index e1ae083..23f23e0 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -1,5 +1,6 @@
 The Ninja build system
 ======================
+v1.10.0, Jan 2020
 
 
 Introduction

src/version.cc

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