From 98943fc9e826eb250249e53bee386f2f948bdd89 Mon Sep 17 00:00:00 2001
From: DH <dh.rpcs3@gmail.com>
Date: Fri, 9 Oct 2015 12:29:24 +0300
Subject: [PATCH 1/2] Added @vlj to developers list (AboutDialog)

---
 rpcs3/Gui/AboutDialog.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rpcs3/Gui/AboutDialog.h b/rpcs3/Gui/AboutDialog.h
index aa1105ce18..90943d550b 100644
--- a/rpcs3/Gui/AboutDialog.h
+++ b/rpcs3/Gui/AboutDialog.h
@@ -43,7 +43,7 @@ AboutDialog::AboutDialog(wxWindow *parent)
 
 	//Credits
 	wxBoxSizer* s_panel_credits(new wxBoxSizer(wxHORIZONTAL));
-	wxStaticText* t_section1 = new wxStaticText(this, wxID_ANY, "\nDevelopers:\n\nDH\nAlexAltea\nHykem\nOil\nNekotekina\nelisha464\nBigpet", wxDefaultPosition, wxSize(156,160));
+	wxStaticText* t_section1 = new wxStaticText(this, wxID_ANY, "\nDevelopers:\n\nDH\nAlexAltea\nHykem\nOil\nNekotekina\nelisha464\nBigpet\nvlj", wxDefaultPosition, wxSize(156,160));
 	wxStaticText* t_section2 = new wxStaticText(this, wxID_ANY, "\nThanks:\n\nBlackDaemon\nAishou\nkrofna\nxsacha", wxDefaultPosition, wxSize(156,160));
 
 	s_panel_credits->AddSpacer(12);

From 97a67746f152bedb9b071337dca8d02b827c2e94 Mon Sep 17 00:00:00 2001
From: Zangetsu38 <Dante38@free.fr>
Date: Thu, 8 Oct 2015 02:36:37 +0200
Subject: [PATCH 2/2] Fix Compilation error with Release/Debug on LLVM

---
 rpcs3/rpcs3.vcxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index daf11368be..0cff6f4e59 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -147,7 +147,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
     <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath);..\glm</IncludePath>
     <OutDir>$(SolutionDir)bin\</OutDir>
-    <LibraryPath>..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\libs\Debug\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
     <TargetName>$(ProjectName)-dbg</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - DX12|x64'">
@@ -180,7 +180,7 @@
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;.\OpenAL\include;$(IncludePath);..\asmjit\src\asmjit;$(UniversalCRT_IncludePath);..\glm</IncludePath>
     <OutDir>$(SolutionDir)bin\</OutDir>
-    <LibraryPath>..\libs\$(Configuration)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
+    <LibraryPath>..\libs\Release\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath)</LibraryPath>
     <LinkIncremental>false</LinkIncremental>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>