Merge: Misc commits to android, json::dynamic and more_collections
authorJean Privat <jean@pryen.org>
Thu, 19 Feb 2015 01:53:28 +0000 (08:53 +0700)
committerJean Privat <jean@pryen.org>
Thu, 19 Feb 2015 01:53:28 +0000 (08:53 +0700)
commit909e5a8b15f959cdde610abf695c31cd4b5cfcc6
tree172d562a58262b81e9bb6e38d160384ed39322fa
parent40d7753d5919afab9590f83f8eee770e7c18b988
parent435d838e63549a7b29e4a1843a0c620a18b91bb5
Merge: Misc commits to android, json::dynamic and more_collections

The gamepad events are based on 2 different gamepads. They will probably need to be revisited with different layouts.

Pull-Request: #1163
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>