Lynix 7d1ddffc53 Merge remote-tracking branch 'refs/remotes/origin/master' into gui ... Former-commit-id: 79463d2933cbd8bc6f0b9de5021a83ef7b5aa29b [formerly 3292aa8d849c9c569315d342fdcb17002547593e] [formerly bbb62690f0e47f3248ed524657fb3e01abaf1dcd [formerly e327e6aad9af55fcf96cea232148729cb73a78d4]] Former-commit-id: cae74a258a54f3b0dc8962d02a39bc2d5d0b6fb2 [formerly 2c3dc59631a1d6923c52216498d97c7b08151520] Former-commit-id: 289eb5a199a6d775b4e0c5dc905aedc518d67e67		2016-08-09 13:58:57 +02:00
..
NDK	Merge remote-tracking branch 'refs/remotes/origin/master' into gui	2016-08-09 13:58:57 +02:00