Merge branch 'master' into 'master'

Ogre SampleBrowser: correct ndk tag to fix build

See merge request fdroid/fdroiddata!6123
This commit is contained in:
Michael Pöhn 2019-12-26 10:18:00 +00:00
commit 4d065578a2

View file

@ -199,7 +199,7 @@ Builds:
.
- cmake --build . -- -j $(nproc)
- gradle -b SampleBrowserNDK/build.gradle assembleRelease
ndk: r17
ndk: r18b
- versionName: 1.12.4
versionCode: 13
@ -213,7 +213,7 @@ Builds:
.
- cmake --build . -- -j $(nproc)
- gradle -b SampleBrowserNDK/build.gradle assembleRelease
ndk: r17
ndk: r18b
MaintainerNotes: |-
For documentation of cmake options see: