diff --git a/Makefile b/Makefile index 8ebd6c85..250b2b1a 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ qtest: qtest-build @echo ./qtest_all.native -push-stable: all +push-stable: git checkout stable git merge master -m 'merge from master' oasis setup