summarylogtreecommitdiffstats
path: root/git-54f7e8cb.patch
diff options
context:
space:
mode:
Diffstat (limited to 'git-54f7e8cb.patch')
-rw-r--r--git-54f7e8cb.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/git-54f7e8cb.patch b/git-54f7e8cb.patch
deleted file mode 100644
index 8cbf12769661..000000000000
--- a/git-54f7e8cb.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 54f7e8cb0433e8cfe607f4f6b9db015156e1c101 Mon Sep 17 00:00:00 2001
-From: Gaerzi <gaerzi@gmail.com>
-Date: Fri, 17 Jan 2014 14:28:53 +0100
-Subject: [PATCH] Restored a few CHR() that were in fact needed.
-
----
- src/MainApp.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/MainApp.cpp b/src/MainApp.cpp
-index d1f7ffa..e2b893b 100644
---- a/src/MainApp.cpp
-+++ b/src/MainApp.cpp
-@@ -861,14 +861,14 @@ void MainApp::readConfigFile()
- if (!token.Cmp("base_resource_paths"))
- {
- // Skip {
-- token = wxString::FromUTF8(tz.getToken());
-+ token = wxString::FromUTF8(CHR(tz.getToken()));
-
- // Read paths until closing brace found
- token = tz.getToken();
- while (token.Cmp("}"))
- {
- theArchiveManager->addBaseResourcePath(token);
-- token = wxString::FromUTF8(tz.getToken());
-+ token = wxString::FromUTF8(CHR(tz.getToken()));
- }
- }
-
-@@ -879,11 +879,11 @@ void MainApp::readConfigFile()
- token = tz.getToken();
-
- // Read files until closing brace found
-- token = wxString::FromUTF8(tz.getToken());
-+ token = wxString::FromUTF8(CHR(tz.getToken()));
- while (token != "}")
- {
- theArchiveManager->addRecentFile(token);
-- token = wxString::FromUTF8(tz.getToken());
-+ token = wxString::FromUTF8(CHR(tz.getToken()));
- }
- }
-
---
-1.8.5.3
-