From 87d9df89bb0bc9a536fd24ecadc2ac881fbe2972 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 25 May 2015 19:00:43 +0200
Subject: [PATCH 1/2] Assets: Move citra.ico from src/assets to dist.

---
 {src/assets => dist}/citra.ico | Bin
 src/citra/citra.rc             |  18 +++++++++---------
 src/citra_qt/citra-qt.rc       | Bin 566 -> 275 bytes
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename {src/assets => dist}/citra.ico (100%)

diff --git a/src/assets/citra.ico b/dist/citra.ico
similarity index 100%
rename from src/assets/citra.ico
rename to dist/citra.ico
diff --git a/src/citra/citra.rc b/src/citra/citra.rc
index 0165e93da..b0edb2e6b 100644
--- a/src/citra/citra.rc
+++ b/src/citra/citra.rc
@@ -1,9 +1,9 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-GLFW_ICON               ICON                    "..\\assets\\citra.ico"
-
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+GLFW_ICON               ICON                    "..\\..\\dist\\citra.ico"
+
diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc
index dd6f834f5c7912583dd49b9387e4d4bfb4dfbaa1..3c7239853ba49ad589aa7f7c75e3efb55bfb5cf7 100644
GIT binary patch
literal 275
zcmb`AK?=h#3<U3f#gYfu^bO6$m-YjOA{>_r96MM}Lw{d|&_nKBB-mNO%DF$vIHv<2
zYuWA3W8?lpu3M50KjKY!O;|F;G~vlj(_WE^tSy0-C3B?CwSbQzv@{bJfugYVR66uZ
nIYT~*vsmLt|M1uQ?SixR?3^4lSR2B=lNN>$xi_-<Z!qQyqy9(E

literal 566
zcmd6jO$x$5429oX@D9NPD4sz#-RK1b8T`Qktzt)umsh_G9qg)W37yPK-pjo7^PcHn
zW2{m3R<fzmPFK|`70>1V>zZ0cC7onC!*6v^19rxe^Ql1nLDh8Q7MOa_9&|)^@3;x2
zQLn)ds?HAZT@g_PCdTZ>GVc4b%)h{iS#O>12JB9Js{3(`PdyVx=hbyD<Z0f_9aq}&
rEwt83b9h5hctf0iZ^AoMZHT~|4bBp$;~icTdj$Hv?^ToR$p7~jmRU**


From c319d1ada7409c396a8724ff62a81b7e41e1a911 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 25 May 2015 19:39:50 +0200
Subject: [PATCH 2/2] Documentation: Move doc-icon.png from the root to dist.

---
 Doxyfile                          |   2 +-
 doc-icon.png => dist/doc-icon.png | Bin
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename doc-icon.png => dist/doc-icon.png (100%)

diff --git a/Doxyfile b/Doxyfile
index 5c2e09246..92faa0b2a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Nintendo 3DS emulator/debugger"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = doc-icon.png
+PROJECT_LOGO           = dist/doc-icon.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/doc-icon.png b/dist/doc-icon.png
similarity index 100%
rename from doc-icon.png
rename to dist/doc-icon.png