aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-25 02:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-01-09 19:42:29 +01:00
commit de5b3b478f
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -28,3 +28,6 @@ before_script:
script: script:
- cmake -Hcode -Bbuild $CMAKE_BUILD_OPTIONS - cmake -Hcode -Bbuild $CMAKE_BUILD_OPTIONS
- cmake --build build -- -j 2 - cmake --build build -- -j 2
notifications:
irc: "chat.freenode.net#ryzomforge"

1
code/ryzom/client/src/seven_zip/Bcj2Enc.cpp
View file

@ -12,7 +12,6 @@
#define PRF(x) #define PRF(x)
#endif #endif
#include <windows.h>
#include <string.h> #include <string.h>
#include "Bcj2.h" #include "Bcj2.h"