From 156a760ebab6839c53f9c613881f0937e814414a Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Fri, 22 May 2020 17:02:32 -0500
Subject: Full revert to tag 2.6.2

Due to a countless number of changes made to the core that were not
fully understood, tested, or documented, it was decided to roll
everything back to the last known stable version (2.6.2).

Changes dropped include:
 - Witness needed
 - Shake
 - Frame SFX
 - Multiple custom objections
 - Multithreaded thumbnail generation
 - Looping
 - Various translation additions
 - "Mirror IC"
 - Color in IC log
 - An invocation of clang-format

Next time, work together and split your big fork into independently
testable feature branches.
---
 resources.qrc | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'resources.qrc')

diff --git a/resources.qrc b/resources.qrc
index 1229bc80..bc9f322e 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -2,12 +2,5 @@
     <qresource prefix="/">
         <file>resource/fonts/Ace-Attorney.ttf</file>
         <file>resource/logo.png</file>
-        <file>resource/translations/ao_de.qm</file>
-        <file>resource/translations/ao_en.qm</file>
-        <file>resource/translations/ao_jp.qm</file>
-        <file>resource/translations/ao_es.qm</file>
-        <file>resource/translations/ao_pt.qm</file>
-        <file>resource/translations/ao_ru.qm</file>
-        <file>resource/translations/ao_pl.qm</file>
     </qresource>
 </RCC>
-- 
cgit 


From e7ec42f977eb1681f20d6b5f68625cda088597e1 Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Sat, 23 May 2020 18:41:27 +0200
Subject: undo branding

---
 resources.qrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resources.qrc')

diff --git a/resources.qrc b/resources.qrc
index bc9f322e..974f797c 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,6 +1,6 @@
 <RCC>
     <qresource prefix="/">
         <file>resource/fonts/Ace-Attorney.ttf</file>
-        <file>resource/logo.png</file>
+        <file>resource/logo_ao2.png</file>
     </qresource>
 </RCC>
-- 
cgit 


From 4c45e45257c6681562de3a3157d7c29975456e2d Mon Sep 17 00:00:00 2001
From: sD <stoned@derpymail.org>
Date: Sat, 23 May 2020 21:01:43 +0200
Subject: include the translations with the client or they can't get loaded

---
 resources.qrc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'resources.qrc')

diff --git a/resources.qrc b/resources.qrc
index 974f797c..cca23ef6 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -2,5 +2,12 @@
     <qresource prefix="/">
         <file>resource/fonts/Ace-Attorney.ttf</file>
         <file>resource/logo_ao2.png</file>
+        <file>resource/translations/ao_de.qm</file>
+        <file>resource/translations/ao_en.qm</file>
+        <file>resource/translations/ao_es.qm</file>
+        <file>resource/translations/ao_jp.qm</file>
+        <file>resource/translations/ao_pl.qm</file>
+        <file>resource/translations/ao_pt.qm</file>
+        <file>resource/translations/ao_ru.qm</file>
     </qresource>
 </RCC>
-- 
cgit