From d8fd449745a720efecb447a560ac9dde5e37180d Mon Sep 17 00:00:00 2001
From: Tony Wasserka <NeoBrainX@gmail.com>
Date: Sun, 20 Oct 2013 15:03:46 +0200
Subject: [PATCH] Installer: Revert the change from the previous commit which
 changed the 32 Bit Program Files folder to be called "Dolphin" instead of
 "Dolphin x86".

Apparently it's not easily possible to install 32 and 64 bit in parallel when the Program Files folder has the same name. Still, we go without the version number in the folder name though.
---
 Installer/Installer.nsi       | 2 +-
 Installer/Installer_win32.nsi | 5 ++---
 Installer/Installer_x64.nsi   | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Installer/Installer.nsi b/Installer/Installer.nsi
index 00954490e367..eaf6b155b807 100644
--- a/Installer/Installer.nsi
+++ b/Installer/Installer.nsi
@@ -100,7 +100,7 @@ SetCompressor /SOLID lzma
 
 ; MUI end ------
 
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+Name "${PRODUCT_NAME}"
 !define UN_NAME "Uninstall $(^Name)"
 OutFile "dolphin-${DOLPHIN_ARCH}-${PRODUCT_VERSION}.exe"
 InstallDir "${BASE_INSTALL_DIR}\$(^Name)"
diff --git a/Installer/Installer_win32.nsi b/Installer/Installer_win32.nsi
index 6e0be28d39ad..35d5d1f62240 100644
--- a/Installer/Installer_win32.nsi
+++ b/Installer/Installer_win32.nsi
@@ -1,6 +1,5 @@
 !define DOLPHIN_ARCH Win32
 !define BASE_INSTALL_DIR "$PROGRAMFILES32"
-!define PRODUCT_NAME "Dolphin"
-!define PRODUCT_PLATFORM "32 Bit"
+!define PRODUCT_NAME "Dolphin x86"
 
-!include Installer.nsi
+!include Installer.nsi
\ No newline at end of file
diff --git a/Installer/Installer_x64.nsi b/Installer/Installer_x64.nsi
index 206868a7c12b..3b6ee79f5057 100644
--- a/Installer/Installer_x64.nsi
+++ b/Installer/Installer_x64.nsi
@@ -1,6 +1,5 @@
 !define DOLPHIN_ARCH x64
 !define BASE_INSTALL_DIR "$PROGRAMFILES64"
 !define PRODUCT_NAME "Dolphin"
-!define PRODUCT_PLATFORM "64 Bit"
 
-!include Installer.nsi
+!include Installer.nsi
\ No newline at end of file