v1.5.0

diff --cc doc/manual.asciidoc
index 6b2296f,fcf3db3..bacb5f6
--- 1/doc/manual.asciidoc
--- 2/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@@ -1,7 -1,6 +1,7 @@@
  Ninja
  =====
  Evan Martin <martine@danga.com>
- v1.4.0, September 2013
++v1.5.0, June 2014
  
  
  Introduction

diff --cc src/version.cc
index 17c71aa,562fce4..6d2d37c
--- 1/src/version.cc
--- 2/src/version.cc
+++ b/src/version.cc
@@@ -18,7 -18,7 +18,7 @@@
  
  #include "util.h"
  
- const char* kNinjaVersion = "1.4.0";
 -const char* kNinjaVersion = "1.5.0.git";
++const char* kNinjaVersion = "1.5.0";
  
  void ParseVersion(const string& version, int* major, int* minor) {
    size_t end = version.find('.');