Skip to content
Snippets Groups Projects
Commit 52e1e0ce authored by Joachim Pouderoux's avatar Joachim Pouderoux Committed by Kitware Robot
Browse files

Merge topic 'FixAndroidBuild' 


2ed358c5 Merge branch 'upstream-diy2' into FixAndroidBuild
bc9d43d5 diy2 2021-07-21 (e47b2b29)
e5535c73 Update diy2 to fix some Android builds
912a2763 Fix Android build

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarTim Thirion <tim.thirion@kitware.com>
Acked-by: default avatarMathieu Westphal <mathieu.westphal@kitware.com>
Acked-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !8163
parents 0bda4b1c 2ed358c5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 73 additions and 32 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment