openmw-tes3coop/apps
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
..
browser [General] Fix code style inconsistencies 2017-05-31 08:37:11 +03:00
bsatool purge the rest of boost::shared and any other boost related things that no longer are required 2017-06-09 19:08:53 +02:00
esmtool purge unnecessary imports 2017-06-09 19:08:53 +02:00
essimporter purge unnecessary imports 2017-06-09 19:08:53 +02:00
launcher Merge pull request #228 from OpenMW/master while resolving conflicts 2017-06-18 18:16:10 +03:00
master [General] Fix code style inconsistencies 2017-05-31 08:37:11 +03:00
mwiniimporter purge unnecessary imports 2017-06-09 19:08:53 +02:00
niftest Removed now unneeded script 2015-08-07 20:53:43 -04:00
opencs Merge pull request #228 from OpenMW/master while resolving conflicts 2017-06-18 18:16:10 +03:00
openmw Merge pull request #228 from OpenMW/master while resolving conflicts 2017-06-18 18:16:10 +03:00
openmw-mp [General] Implement CleanChat() 2017-06-12 08:01:47 +08:00
openmw_test_suite Fixed Travis CI build 2017-05-08 11:16:03 +04:00
wizard Stopping the thread in the wizard that prevented it to stop correctly 2017-06-13 12:00:55 +02:00
doc.hpp