diff options
| author |  Yuri Kunde Schlesner | 2015-05-29 13:56:58 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-29 13:56:58 -0700 |
| commit | fb597b6d68ea07b3b692f9108d4be9c23c8c2585 (patch) | |
| tree | 2bb6189f41188c654c8b85dfbf8156addb676ada /src | |
| parent | Merge pull request #828 from lioncash/seq (diff) | |
| parent | Documentation: Move doc-icon.png from the root to dist. (diff) | |
| download | yuzu-fb597b6d68ea07b3b692f9108d4be9c23c8c2585.tar.gz yuzu-fb597b6d68ea07b3b692f9108d4be9c23c8c2585.tar.xz yuzu-fb597b6d68ea07b3b692f9108d4be9c23c8c2585.zip | |
Merge pull request #817 from linkmauve/citra.ico
Move src/assets/citra.ico and doc-icon.png to dist
Diffstat (limited to '')
| -rw-r--r-- | dist/citra.ico (renamed from src/assets/citra.ico) | bin | 509287 -> 509287 bytes | |||
| -rw-r--r-- | src/citra/citra.rc | 18 | ||||
| -rw-r--r-- | src/citra_qt/citra-qt.rc | bin | 566 -> 275 bytes |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/assets/citra.ico b/dist/citra.ico index 4fef651e2..4fef651e2 100644 --- a/src/assets/citra.ico +++ b/dist/citra.ico | |||
| Binary files differ | |||
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 @@ | |||
| 1 | ///////////////////////////////////////////////////////////////////////////// | 1 | ///////////////////////////////////////////////////////////////////////////// |
| 2 | // | 2 | // |
| 3 | // Icon | 3 | // Icon |
| 4 | // | 4 | // |
| 5 | 5 | ||
| 6 | // Icon with lowest ID value placed first to ensure application icon | 6 | // Icon with lowest ID value placed first to ensure application icon |
| 7 | // remains consistent on all systems. | 7 | // remains consistent on all systems. |
| 8 | GLFW_ICON ICON "..\\assets\\citra.ico" | 8 | GLFW_ICON ICON "..\\..\\dist\\citra.ico" |
| 9 | 9 | ||
diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc index dd6f834f5..3c7239853 100644 --- a/src/citra_qt/citra-qt.rc +++ b/src/citra_qt/citra-qt.rc | |||
| Binary files differ | |||