David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts ... Conflicts: CMakeLists.txt apps/openmw/engine.cpp apps/openmw/main.cpp apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwmechanics/character.cpp components/CMakeLists.txt		2018-07-14 03:57:05 +03:00
..
before_install.linux.sh	Travis: use qt5, newer boost libraries, callff, gcc/clang builds...	2018-05-10 18:02:45 -04:00
before_install.osx.sh	tell unzip to overwrite all files	2018-06-26 14:01:10 +00:00
before_script.linux.sh	Travis: use qt5, newer boost libraries, callff, gcc/clang builds...	2018-05-10 18:02:45 -04:00
before_script.msvc.sh	Merge branch 'master' into 'win10_ci'	2018-07-04 15:21:45 +00:00
before_script.osx.sh	no need for macos_qt_formula since on osx there is no more qt4, just qt5	2018-06-26 13:50:45 +00:00
build.msvc.sh	msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh	2017-06-19 06:00:42 -07: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] Do not upload a nightly if there's already one of the same commit	2018-05-24 23:00:59 +02:00