Merge pull request #3528 from ilya-lavrenov:update_android_cmake

35d730bf · Vadim Pisarevsky · 79f77045 · 96adeb71 · 35d730bf
Commit 35d730bf authored Dec 22, 2014 by Vadim Pisarevsky
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

android.toolchain.cmake platforms/android/android.toolchain.cmake +0 -0

No files found.
--- a/platforms/android/android.toolchain.cmake
+++ b/platforms/android/android.toolchain.cmake