From aed875fe3bd5b39cbd006f5ac190ce2586754c35 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sat, 9 Jan 2016 19:42:29 +0100
Subject: [PATCH] Merge with develop

---
 .travis.yml                                 | 3 +++
 code/ryzom/client/src/seven_zip/Bcj2Enc.cpp | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7dfa50dae..1e9a39af6 100644
--- 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"
diff --git a/code/ryzom/client/src/seven_zip/Bcj2Enc.cpp b/code/ryzom/client/src/seven_zip/Bcj2Enc.cpp
index 04ad5f0ba..be600f918 100644
--- 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"