From 460c03a00d64b5355180a967a2f968301ebc5bbc Mon Sep 17 00:00:00 2001
From: Daniel Dressler <danieru.dressler@gmail.com>
Date: Wed, 3 Jul 2013 22:00:55 -0700
Subject: [PATCH] Make key map defaults match old mapping

---
 Common/KeyMap.cpp | 8 ++++----
 native            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 4ea005343f..6d980d8f15 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -30,10 +30,10 @@ struct DefaultKeyMap {
 	static std::map<int,int> init()
 	{
 		std::map<int,int> m;
-		m[KEYCODE_X] = CTRL_SQUARE;
-		m[KEYCODE_Z] = CTRL_TRIANGLE;
-		m[KEYCODE_S] = CTRL_CIRCLE;
-		m[KEYCODE_A] = CTRL_CROSS;
+		m[KEYCODE_A] = CTRL_SQUARE;
+		m[KEYCODE_S] = CTRL_TRIANGLE;
+		m[KEYCODE_X] = CTRL_CIRCLE;
+		m[KEYCODE_Z] = CTRL_CROSS;
 		m[KEYCODE_Q] = CTRL_LTRIGGER;
 		m[KEYCODE_W] = CTRL_RTRIGGER;
 		m[KEYCODE_SPACE] = CTRL_START;
diff --git a/native b/native
index d28b58a203..c97ed9fa3f 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit d28b58a203dd7fe51b88318b18af83675fa6745d
+Subproject commit c97ed9fa3f8a6fc8da53d18c208b8cd0beece334