From: Evan Martin <martine@danga.com>
Date: Thu, 16 May 2013 23:23:29 +0000 (-0700)
Subject: Merge branch 'master' into release
X-Git-Tag: v1.3.0~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddb21217f90e2fc6639d68b240ad2fc394b2dc6c;p=platform%2Fupstream%2Fninja.git

Merge branch 'master' into release
---

ddb21217f90e2fc6639d68b240ad2fc394b2dc6c
diff --cc src/version.cc
index 45fb040,18fa96a..07167fe
--- a/src/version.cc
+++ b/src/version.cc
@@@ -18,7 -18,7 +18,7 @@@
  
  #include "util.h"
  
- const char* kNinjaVersion = "1.2.0";
 -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('.');