Merge with develop

--HG-- branch : compatibility-develop
9 years ago · de5b3b478f
parent 4ca5d07360 d526e90105
commit de5b3b478f
2 changed files with 3 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -28,3 +28,6 @@ before_script:
 script:
    - cmake -Hcode -Bbuild $CMAKE_BUILD_OPTIONS
    - cmake --build build -- -j 2
 notifications:
    irc: "chat.freenode.net#ryzomforge"
--- a/code/ryzom/client/src/seven_zip/Bcj2Enc.cpp
+++ b/code/ryzom/client/src/seven_zip/Bcj2Enc.cpp
@ -12,7 +12,6 @@
 #define PRF(x)
 #endif
 #include <windows.h>
 #include <string.h>
 #include "Bcj2.h"