sync version number in master with release

Update RELEASING with notes on how to not screw this up again.

diff --git a/RELEASING b/RELEASING
index 3f83c7b..4d2e46a 100644 (file)
--- a/RELEASING
+++ b/RELEASING
@@ -1,9 +1,10 @@
 Notes to myself on all the steps to make for a Ninja release.
 
-1. git checkout release; git merge master
-2. fix version number in source (it will likely conflict in the above)
-3. fix version in doc/manual.asciidoc
-4. rebuild manual, put in place on website
-5. commit, tag, push
-6. construct release notes from prior notes
+1. update src/version.cc with new version (with ".git")
+2. git checkout release; git merge master
+3. fix version number in src/version.cc (it will likely conflict in the above)
+4. fix version in doc/manual.asciidoc
+5. rebuild manual, put in place on website
+6. commit, tag, push
+7. construct release notes from prior notes
    credits: git shortlog -s --no-merges REV..

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