diff options
| author | Konstantin Ullrich <konstantinullrich12@gmail.com> | 2024-10-07 12:37:30 +0200 |
|---|---|---|
| committer | Konstantin Ullrich <konstantinullrich12@gmail.com> | 2024-10-07 12:37:30 +0200 |
| commit | 98272ee381bd07081502dd426226f58c879300a6 (patch) | |
| tree | 672f6f06727dbc1c84270973ce13e9403913e481 /patches/monero/0013-android-ndk-version-bump.patch | |
| parent | 04b29d84a2c368c677cf5ec946269203622ca170 (diff) | |
| parent | 67f4baa015a4407d096e35b6e5a81d72932fb55f (diff) | |
Merge branch 'master' into ledger
# Conflicts:
# .github/workflows/full_check.yaml
# impls/monero.dart/lib/monero.dart
# impls/monero.dart/pubspec.yaml
# patches/monero/0016-add-dummy-device-for-ledger.patch
Diffstat (limited to 'patches/monero/0013-android-ndk-version-bump.patch')
| -rw-r--r-- | patches/monero/0013-android-ndk-version-bump.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/monero/0013-android-ndk-version-bump.patch b/patches/monero/0013-android-ndk-version-bump.patch index dce3536..2b741a0 100644 --- a/patches/monero/0013-android-ndk-version-bump.patch +++ b/patches/monero/0013-android-ndk-version-bump.patch @@ -1,7 +1,7 @@ -From 5815bf9d5dd2420915fafb73a3314eb467a489a7 Mon Sep 17 00:00:00 2001 +From 1b978a697e1bdb3144bc08f998d125ac593fa971 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto <cyjan@mrcyjanek.net> Date: Thu, 23 May 2024 08:02:49 +0200 -Subject: [PATCH] android ndk version bump +Subject: [PATCH 13/16] android ndk version bump --- contrib/depends/hosts/android.mk | 16 +++++++++++++--- |