aboutsummaryrefslogtreecommitdiff
path: root/src/testdir/Makefile
diff options
context:
space:
mode:
authorashleyh <gh@ashleyh.eu>2014-02-26 22:10:25 +0000
committerashleyh <gh@ashleyh.eu>2014-02-26 22:10:25 +0000
commit00ba300d3941d5e9d59ffffcb760eb0f9d1079ef (patch)
tree2b22d404b040adf2441af3b8369db44b800ac5ab /src/testdir/Makefile
parent14cbd618ec4930878afc6f9073d9ebb9e514fd75 (diff)
parent314791dca7b80e167165694222dfc0f70dd77e5c (diff)
downloadrneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.tar.gz
rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.tar.bz2
rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.zip
Merge branch 'master' into pr36
Conflicts: README.md
Diffstat (limited to 'src/testdir/Makefile')
-rw-r--r--src/testdir/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 5238fda86a..16db2846c2 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -2,7 +2,7 @@
# Makefile to run all tests for Vim
#
-VIMPROG = ../../build/src/vim
+VIMPROG = ../../build/bin/nvim
# Uncomment this line to use valgrind for memory leaks and extra warnings.
# The output goes into a file "valgrind.testN"