Andrey Kamaev 949c4edf41 Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00

..

android_additional.h

Fixed tbb hang in Android apps

2012-02-29 08:11:01 +00:00

CMakeLists.txt

Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00

version_string.tmp

Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00

version_string.ver

Merged the trunk r8408:8457 (inclusive)

2012-05-30 08:47:34 +00:00