From 5b58497b0d2b290403cb4ff2f3c0267ea3af6f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Fri, 1 Nov 2013 12:03:38 +0100
Subject: [PATCH] Flip the default Y-axis stick mapping for Ouya

---
 Common/KeyMap.cpp | 4 ++--
 lang              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index f83cf56b0f..4f94900a83 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -250,8 +250,8 @@ static const DefMappingStruct defaultOuyaMap[] = {
 	{VIRTKEY_PAUSE       , NKCODE_BUTTON_THUMBR},
 	{VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1},
 	{VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1},
-	{VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, -1},
-	{VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, +1},
+	{VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1},
+	{VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1},
 };
 
 static const DefMappingStruct defaultXperiaPlay[] = {
diff --git a/lang b/lang
index e5990f704a..0031540033 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit e5990f704a05a55d8717135fca23afc345fc469a
+Subproject commit 003154003358c1919affef0d8013d9fbdbf35510