From b93d68ad8d9bcbf636be4d4c8b46b2b3d52bacf4 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Fri, 11 Jul 2014 22:44:21 +0200 Subject: [PATCH] small change in makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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