Lynix b8955b3a58 Merge remote-tracking branch 'refs/remotes/origin/master' into gui ...

Former-commit-id: 59196209e6eeed397230c6045118644c1a16e8c4 [formerly 202ed159fbcf23c31800981958bbcc5cf19541ef] [formerly 26b15fd1fcc56e0688b9c5b96f7ecf520a94659e [formerly c3aec70c11386ff7de6b3c24fc305d85d8fa99bb]]
Former-commit-id: f408bb60f5f63049a69c092fef8f505489cf25d7 [formerly 1ae19a052b01f9d6a1f68feb713b7b29165b62c1]
Former-commit-id: ba308fa71ecc78736df1ab12444bbf4014c2e1c5

2016-09-13 13:12:53 +02:00

..

include/NDK

Merge branch 'master' into gui

2016-09-06 13:57:25 +02:00

src/NDK

Merge remote-tracking branch 'refs/remotes/origin/master' into gui

2016-09-13 13:12:53 +02:00