Merge with develop

--HG--
branch : compatibility-develop

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()

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