From: Nico Weber <nicolasweber@gmx.de>
Date: Mon, 29 Jun 2015 17:21:30 +0000 (-0700)
Subject: v1.6.0
X-Git-Tag: v1.6.0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=484c16336f19bd8970bb6e75322d61b92a229899;p=platform%2Fupstream%2Fninja.git

v1.6.0
---

484c16336f19bd8970bb6e75322d61b92a229899
diff --cc doc/manual.asciidoc
index 21f4e42,003c71e..dc4ffad
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@@ -1,7 -1,6 +1,7 @@@
  Ninja
  =====
  Evan Martin <martine@danga.com>
- v1.5.3, Nov 2014
++v1.6.0, Jun 2015
  
  
  Introduction
diff --cc src/version.cc
index 2d2d9c0,4c2aea1..14d43f0
--- a/src/version.cc
+++ b/src/version.cc
@@@ -18,7 -18,7 +18,7 @@@
  
  #include "util.h"
  
- const char* kNinjaVersion = "1.5.3";
 -const char* kNinjaVersion = "1.6.0.git";
++const char* kNinjaVersion = "1.6.0";
  
  void ParseVersion(const string& version, int* major, int* minor) {
    size_t end = version.find('.');