Merge branch 'devel' into jreiser

2017-03-23 13:27:09 -07:00
parent bd5479b250 b10f1df49f
commit 6bb31e276e
40 changed files with 4488 additions and 4262 deletions
@@ -7,6 +7,9 @@ set -e; set -o pipefail

 CLANG_FORMAT="$HOME/local/bin/bin-upx/clang-format-3.9.0"
 if [[ ! -f $CLANG_FORMAT ]]; then
+CLANG_FORMAT="$HOME/.local/bin/bin-upx/clang-format-3.9.0"
+fi
+if [[ ! -f $CLANG_FORMAT ]]; then
 CLANG_FORMAT="$HOME/bin/bin-upx/clang-format-3.9.0"
 fi
 if [[ ! -f $CLANG_FORMAT ]]; then