David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt		2017-03-13 18:20:07 +02:00
..
before_install.linux.sh
before_install.osx.sh
before_script.linux.sh
before_script.msvc.sh
before_script.osx.sh
build.msvc.sh
check_tabs.sh
deploy.osx.sh