Pantyhose-X/freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update submodules

Browse Source
This commit is contained in:
proller 2016-08-26 09:53:32 +03:00
parent 8621148d6b
commit 2e27b70331
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/default

@ -1 +1 @@
Subproject commit bc40821c9c793d060d23d7552a91eb69ece4c3d6
Subproject commit 717150a01ba1fd9f35243766569de6cb2c15656c

2
util/merge_minetest.sh
View File

@ -5,7 +5,7 @@ cd ..
git remote add minetest https://github.com/minetest/minetest.git
git fetch --all
git pull
( git merge --no-edit minetest/master | grep -i "conflict" ) && exit
#( git merge --no-edit minetest/master | grep -i "conflict" ) && exit
#git submodule foreach --recursive "git pull||true"
cd games