Merge branch 'release/6.0.0'

Author: vigsterkr

.gitignore

@@ -45,9 +45,6 @@ cpplint.py
 /doc/pages*/Examples*.mainpage
 
 # /src/
-/src/shogun/lib/versionstring.h
-/src/shogun/lib/config.h
-/src/shogun/base/class_list.cpp
 /src/shogun/Makefile
 /src/interfaces/*/Makefile
 /src/examples

.gitmodules

@@ -2,15 +2,6 @@
 	path = data
 	url = git://github.com/shogun-toolbox/shogun-data.git
 	branch = master
-[submodule "doc/tutorial"]
-	path = doc/tutorial
-	url = git://github.com/shogun-toolbox/shogun-tutorial.git
 [submodule "debian"]
 	path = debian
 	url = git://github.com/shogun-toolbox/shogun-debian.git
-[submodule "doc/wiki"]
-	path = doc/wiki
-	url = git://github.com/shogun-toolbox/shogun-wiki.git
-[submodule "doc/readme"]
-	path = doc/readme
-	url = git://github.com/shogun-toolbox/docs.git

.travis.yml

@@ -60,6 +60,12 @@ matrix:
         - CMAKE_OPTIONS="-DRModular=ON -DTRAVIS_DISABLE_UNIT_TESTS=ON -DTRAVIS_DISABLE_LIBSHOGUN_TESTS=ON"
         - CC=clang
         - CXX=clang++
+    - compiler: clang
+      services: docker
+      env:
+        - CMAKE_OPTIONS="-DScalaModular=ON -DTRAVIS_DISABLE_UNIT_TESTS=ON -DTRAVIS_DISABLE_LIBSHOGUN_TESTS=ON"
+        - CC=clang
+        - CXX=clang++
 before_install:
   - docker pull shogun/shogun-dev
   - echo $CC; echo $CXX