David Cernat 3b7693c719 Resolve conflicts in pull request #55 ... # Conflicts: # README.md # apps/openmw/mwclass/npc.cpp # apps/openmw/mwmechanics/combat.cpp		2016-09-15 08:49:57 +03:00
..
before_install.linux.sh	Disable OS X in Travis CI	2016-09-04 17:58:28 +08:00
before_install.osx.sh	Reactivate OS X CI	2016-03-06 16:09:10 +01:00
before_script.linux.sh	Travis: disable build server for clang	2016-09-04 19:10:39 +08:00
before_script.msvc.sh	Include the OpenAL32.dll file into builds	2016-09-02 06:57:36 +02:00
before_script.osx.sh	Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library	2016-08-16 06:06:30 +03: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