Merge branch 'develop' into merge-into-atys

5 years ago · 3be969a73d
parent 4aa94b3ae9 14076b899d
commit 3be969a73d
2 changed files with 2 additions and 2 deletions
--- a/code/nel/include/nel/misc/base64.h
+++ b/code/nel/include/nel/misc/base64.h
@ -16,7 +16,7 @@


 #ifndef NL_BASE64_H
-#define NL_BASE64_h
+#define NL_BASE64_H

 namespace NLMISC
 {
--- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
@ -28,7 +28,7 @@
 #include "filesextractor.h"
 #include "filescleaner.h"

-#include "seven_zip.h"
+#include "nel/misc/seven_zip.h"

 #if defined(Q_OS_WIN32) && defined(QT_WINEXTRAS_LIB)
 #include <QtWinExtras/QWinTaskbarProgress>