Lynix f9d7dbba57 Merge branch 'master' into gui ... Former-commit-id: 4219b882862695f5855081ea997d64bec14a7ec7 [formerly 00d365bfa5c84b97f410e5cc3dd6cfbea0be179f] [formerly fdb4829bc4371afc415aeb0c31bc5f96046cb865 [formerly 346917aade13eb3ae2562cc7490244e338878b41]] Former-commit-id: 9610a43f6de50988aad9008c45c65ca5f3ba4d84 [formerly aabaeeec873c5595e784d30e24f6f6c5add38889] Former-commit-id: 98193fb1c618cc6ecc4af809089161c7a9bab95f		2016-09-06 13:57:25 +02:00
..
include/NDK	Merge branch 'master' into gui	2016-09-06 13:57:25 +02:00
src/NDK	Merge branch 'master' into gui	2016-09-06 13:57:25 +02:00