Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-09 19:42:29 +01:00
parent 6e471c02d3
commit aed875fe3b
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"