summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-03 12:11:20 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-03 12:11:20 +0000
commitfde0bbc7ac702d3dcea97cdd9e8e9cee68096c9a (patch)
tree1bd5ecdf798d3542e67119d03e117a568a4a342f
parentc2a00ffb3f71e948b420cc0cd15fc5cefdf62a03 (diff)
parentd48234e2de0d2dd459a8903913875cbf4b3998fc (diff)
Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth
-rw-r--r--.gitignore3
-rwxr-xr-xwafbin87683 -> 100743 bytes
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4810d94..b3b15b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
*.o
*.lo
-.lock-waf_linux2_build
+.lock-waf_*
.waf-1.6.11-*
+.waf3-*
Makefile
*~
build/
diff --git a/waf b/waf
index 178461f..4b322f1 100755
--- a/waf
+++ b/waf
Binary files differ