merge from default

--HG--
branch : branch-bnp-manager-plugin

code/nel/tools/3d/object_viewer_qt/src/plugins/object_viewer/attrib_widget.h

@@ -58,7 +58,7 @@ public:
 	/// Force to update dialog content
 	void updateUi();
 
-	/// Сonnects all the slots with signals
+	/// Connects all the slots with signals
 	void init();
 
 	/// Sets the pointer CWorkspaceNode* in the wrappers.
@@ -192,6 +192,7 @@ protected:
 	QDialog *_SchemeWidget;
 
 	Ui::CAttribWidget _ui;
+	friend class CSchemeBankDialog;
 }; /* class CAttribWidget */
 
 /**

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -1,4 +1,5 @@
 FILE(GLOB SRC main.cpp
+	${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp
@@ -21,6 +22,11 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				ryzom_sevenzip
 				${CURL_LIBRARIES})
 
+IF(APPLE)
+  FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
+  TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
+ENDIF(APPLE)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
 
 NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")