Lynix 1ae36e4a53 Merge remote-tracking branch 'refs/remotes/origin/master' into gui ... Former-commit-id: 631344e1f2517a511f0b3b877acc4e80a68c3ce5 [formerly 515910f81b988b3ff9df081d639fffd8df04bb7d] [formerly 6781a775127039b7e3fcd0f44d5fbde308dd17c4 [formerly 4690ef3819e0268f4aa8abf68e9b87fa3de4b15b]] Former-commit-id: 9a89f053586566ee22cedfcea9c8a187256f4fc1 [formerly 67ec1747da393f855ba509fc21636bb3d91cb599] Former-commit-id: 41f11195fa21427aa5e834f945b4d47509089c30		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