David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts ...

# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp

2017-02-10 21:39:16 +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

…