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 | 4c7d2c5ba6e64b5041aec931f48279cfeba1155d (patch) | |
tree | 1883cbfa152cdb2502babee7e10fbc2cdf72415e | |
parent | 90252e8dcc284a3213ae738052c6b6d95628eea7 (diff) | |
parent | 7b9355994bff374e6fc2b578df410313fab0e9ce (diff) | |
download | prosody-4c7d2c5ba6e64b5041aec931f48279cfeba1155d.tar.gz prosody-4c7d2c5ba6e64b5041aec931f48279cfeba1155d.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 |