From a782130a2e51b914d45d2bb3ddc25499d64b0020 Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy@waf.io>
Date: Fri, 2 Jun 2017 21:19:25 +0200
Subject: [PATCH] waf-1.9.12

---
 ChangeLog         | 11 +++++++++++
 waf-light         |  2 +-
 waflib/Context.py |  6 +++---
 wscript           |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7451bc1c..ab9249bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+NEW IN WAF 1.9.12
+-----------------
+* Work around Python 3.6 encoding issues #1974
+* Handle spaces in python path detection on windows #1973
+* Set a better default path for windows import libraries #1959
+* Fix variable propagation for javac targets #1969
+* Various cpplint enhancements #1961 #1963
+* Various eclipse project generator enhancements #1967 #1968 #1970
+* Various C# enhancements #1975 #1976 #1977
+* Override resx namespaces #1978
+
 NEW IN WAF 1.9.11
 -----------------
 * Detect Visual Studio 2017 Build Tools using vswhere.exe #1945
diff --git a/waf-light b/waf-light
index 88fe978f..23502ed1 100755
--- a/waf-light
+++ b/waf-light
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 import os, sys, inspect
 
-VERSION="1.9.11"
+VERSION="1.9.12"
 REVISION="x"
 GIT="x"
 INSTALL="x"
diff --git a/waflib/Context.py b/waflib/Context.py
index 4d241f25..268f57b1 100644
--- a/waflib/Context.py
+++ b/waflib/Context.py
@@ -11,13 +11,13 @@ from waflib import Utils, Errors, Logs
 import waflib.Node
 
 # the following 3 constants are updated on each new release (do not touch)
-HEXVERSION=0x1090b00
+HEXVERSION=0x1090c00
 """Constant updated on new releases"""
 
-WAFVERSION="1.9.11"
+WAFVERSION="1.9.12"
 """Constant updated on new releases"""
 
-WAFREVISION="a65c7c03b7012cc6c3fb0f9c9a3be8abc06bc511"
+WAFREVISION="7641eac6c337687ada2e21655c0202345270cc22"
 """Git revision when the waf version is updated"""
 
 ABI = 99
diff --git a/wscript b/wscript
index 0744b5f3..50be679a 100644
--- a/wscript
+++ b/wscript
@@ -9,7 +9,7 @@ To add a tool that does not exist in the folder compat15, pass an absolute path:
 ./waf-light  --tools=compat15,/comp/waf/aba.py --prelude=$'\tfrom waflib.extras import aba\n\taba.foo()'
 """
 
-VERSION="1.9.11"
+VERSION="1.9.12"
 APPNAME='waf'
 REVISION=''