diff --git a/Makefile b/Makefile index 6b1aa59..7586406 100644 --- a/Makefile +++ b/Makefile @@ -69,3 +69,10 @@ build-windows: # git push --set-upstream origin devel devel: git checkout devel + +merge-devel: + git checkout master + git pull origin master + git merge devel + git push origin master + git checkout devel