From: Jean Privat Date: Thu, 19 Feb 2015 01:53:28 +0000 (+0700) Subject: Merge: Misc commits to android, json::dynamic and more_collections X-Git-Tag: v0.7.2~13 X-Git-Url: http://nitlanguage.org 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 Reviewed-by: Lucas Bajolet --- 909e5a8b15f959cdde610abf695c31cd4b5cfcc6