diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-18 19:09:37 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-18 19:09:37 +0100 |
commit | ba45830f3e579a981ed7b2ebd3c04fddc9bc81b0 (patch) | |
tree | 1883cbfa152cdb2502babee7e10fbc2cdf72415e | |
parent | 03bec1a29092503dd477406236bfe769c48e613c (diff) | |
parent | 2c3bcf3a57c7718472224e6998789ef74eca7ef1 (diff) | |
download | prosody-ba45830f3e579a981ed7b2ebd3c04fddc9bc81b0.tar.gz prosody-ba45830f3e579a981ed7b2ebd3c04fddc9bc81b0.zip |
Merge 0.10->trunk
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -53,7 +53,7 @@ clean: $(MAKE) clean -C util-src test: - cd tests && ./run_tests.sh + cd tests && $(RUNWITH) test.lua util/%.so: $(MAKE) install -C util-src |