summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Android/ButtonManager.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-20 02:08:44 +0100
commit6d8df311a32cd9841aa9fa81228f3ba5180d26be (patch)
treecfa2e210a36bbe5063fdbc23e4cbbfd3d78b63a4 /Source/Core/DolphinWX/Android/ButtonManager.cpp
parentafba0d736d363fa4c71b86d84a1caad3d52f147e (diff)
parent24ba058404d8036a977a41e55c58a7326302cb34 (diff)
Merge pull request #88 from lioncash/relative-includes
Relative includes
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
-rw-r--r--Source/Core/DolphinWX/Android/ButtonManager.cpp24
1 files changed, 6 insertions, 18 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index 257237252f..a8ebafdd20 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -1,23 +1,11 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
#include <unordered_map>
-#include "GLInterface/GLInterface.h"
-#include "Android/ButtonManager.h"
+
+#include "DolphinWX/Android/ButtonManager.h"
+#include "DolphinWX/GLInterface/GLInterface.h"
namespace ButtonManager
{