Merge branch 'freeminer' into 'master'
Update freeminer to 0.4.13.7.56 54 was failed to build, so no history See merge request !1178
This commit is contained in:
commit
861b9c4af8
|
@ -67,9 +67,8 @@ Build:0.4.13.7.48,48
|
||||||
for n in 1 2 3; do make release && \
|
for n in 1 2 3; do make release && \
|
||||||
break; done
|
break; done
|
||||||
|
|
||||||
Build:0.4.13.7.54,54
|
Build:0.4.13.7.56,56
|
||||||
disable=missing freetype
|
commit=77865cfb43464f0229a1521bef7efd562fc00b4f
|
||||||
commit=f0a22447f3980b8d378bf4fab92d65bde2117c95
|
|
||||||
subdir=build/android
|
subdir=build/android
|
||||||
submodules=yes
|
submodules=yes
|
||||||
output=bin/freeminer-release-unsigned.apk
|
output=bin/freeminer-release-unsigned.apk
|
||||||
|
@ -78,9 +77,8 @@ Build:0.4.13.7.54,54
|
||||||
for n in 1 2 3; do make -j $(nproc || sysctl -n hw.ncpu || echo 2) && \
|
for n in 1 2 3; do make -j $(nproc || sysctl -n hw.ncpu || echo 2) && \
|
||||||
break; done
|
break; done
|
||||||
|
|
||||||
Build:0.4.13.7.54,55
|
Build:0.4.13.7.56,57
|
||||||
disable=missing freetype
|
commit=77865cfb43464f0229a1521bef7efd562fc00b4f
|
||||||
commit=f0a22447f3980b8d378bf4fab92d65bde2117c95
|
|
||||||
subdir=build/android
|
subdir=build/android
|
||||||
submodules=yes
|
submodules=yes
|
||||||
output=bin/freeminer-release-unsigned.apk
|
output=bin/freeminer-release-unsigned.apk
|
||||||
|
|
Loading…
Reference in a new issue