commit ddb21217f90e2fc6639d68b240ad2fc394b2dc6c
author Evan Martin <martine@danga.com> Thu May 16 16:23:29 2013 -0700
committer Evan Martin <martine@danga.com> Thu May 16 16:23:29 2013 -0700
tree b72aa49307eb6d4e9fd0781ae3202261b127c4e8
parent d0d199e99fe6648c3994ecbbe0c7927065b22d16
parent 31ef1415f208e04000424e6fc446fe4377bc7ed3

Merge branch 'master' into release

doc/manual.asciidoc

diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index aa5644d..b2c591e 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -1,6 +1,7 @@
 Ninja
 =====
 Evan Martin <martine@danga.com>
+v1.2.0, April 2012
 
 
 Introduction

src/version.cc

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