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	Disable OS X in Travis CI	2016-09-04 17:58:28 +08:00
before_install.osx.sh	[macOS, CI] Use most recent prebuilt dependencies	2017-03-05 23:01:16 +01:00
before_script.linux.sh	[CI] Disable Browser	2017-01-27 19:44:35 +08:00
before_script.msvc.sh	Update Bullet to 2.86	2017-02-10 11:37:36 +01:00
before_script.osx.sh	[macOS, CI] Use Release configuration	2017-03-05 23:01:16 +01: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