propagated some fixes from 2.3 to trunk

This commit is contained in:
Vadim Pisarevsky
2011-06-23 12:00:09 +00:00
parent d4fbb2c4fb
commit 49467947ac
26 changed files with 378 additions and 318 deletions

View File

@@ -51,4 +51,4 @@ if (ARMEABI_V7A AND NOT BUILD_ANDROID_CAMERA_WRAPPER)
DESTINATION lib
COMPONENT main)
endforeach()
endif()
endif()