From e67d86eeda594ff76973cf54b79dbb0665eb3576 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Wed, 12 Oct 2016 15:12:52 +0200
Subject: [PATCH] Merge with develop

---
 code/ryzom/client/unix/CMakeLists.txt | 2 +-
 code/ryzom/client/unix/upgd_nl.sh     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/ryzom/client/unix/CMakeLists.txt b/code/ryzom/client/unix/CMakeLists.txt
index ee7179c07..3e8d12540 100644
--- a/code/ryzom/client/unix/CMakeLists.txt
+++ b/code/ryzom/client/unix/CMakeLists.txt
@@ -12,5 +12,5 @@ IF(WITH_UNIX_STRUCTURE)
   INSTALL(FILES ryzom_128x128.png DESTINATION share/icons/hicolor/128x128/apps RENAME ${RYZOM_CLIENT_ICON}.png)
 ELSE()
   # in case of local client, only copy 48x48 icon
-  INSTALL(FILES ryzom_48x48.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png)
+  INSTALL(FILES ryzom_128x128.png DESTINATION ${RYZOM_ETC_PREFIX} RENAME ${RYZOM_CLIENT_ICON}.png)
 ENDIF()
diff --git a/code/ryzom/client/unix/upgd_nl.sh b/code/ryzom/client/unix/upgd_nl.sh
index 4a18675ef..0e28a1555 100644
--- a/code/ryzom/client/unix/upgd_nl.sh
+++ b/code/ryzom/client/unix/upgd_nl.sh
@@ -11,5 +11,6 @@ chmod +x "$ROOTPATH/ryzom_client"
 chmod +x "$ROOTPATH/crash_report"
 chmod +x "$ROOTPATH/ryzom_client_patcher"
 chmod +x "$ROOTPATH/ryzom_configuration_qt"
+chmod +x "$ROOTPATH/ryzom_installer_qt"
 
 exit 0