David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp		2017-06-18 18:16:10 +03:00
..
before_install.linux.sh	Disable OS X in Travis CI	2016-09-04 17:58:28 +08:00
before_install.osx.sh	[macOS, CI] Use most recent dependencies	2017-06-13 08:44:55 +02:00
before_script.linux.sh	[CI] Disable Browser	2017-01-27 19:44:35 +08:00
before_script.msvc.sh	And apparently they're only doing zips now	2017-05-06 09:38:14 +02:00
before_script.osx.sh	[macOS, CI] Use Release configuration	2017-06-09 16:49:25 +02:00
build.msvc.sh	Visual Studio 2015 support	2016-08-28 21:42:48 +02:00
check_tabs.sh	Fix the check_tabs.sh script choking on QT generated UI files when doing an in-source build	2015-11-04 20:25:03 +01:00
deploy.osx.sh	[macOS, CI] Configure deployment of nightly builds to FTP	2017-03-07 21:53:49 +01:00