1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 04:45:34 +00:00
openmw-tes3mp/apps
Marc Zinnschlag c5ae95aedd Merge branch 'master' into c++11
Conflicts:
	apps/openmw/mwworld/store.hpp
2015-07-10 09:23:12 +02:00
..
bsatool Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-13 21:11:24 +02:00
esmtool Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-14 16:32:13 +02:00
essimporter Merge branch 'master' into c++11 2015-07-10 09:23:12 +02:00
launcher Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-16 19:53:41 +02:00
mwiniimporter Fix for possibly missing library on windows 2015-06-12 15:22:19 +02:00
opencs Merge branch 'master' into c++11 2015-07-10 09:23:12 +02:00
openmw Merge branch 'master' into c++11 2015-07-10 09:23:12 +02:00
openmw_test_suite UnitTests: add another dialogue keyword test 2015-01-10 00:29:07 +01:00
wizard replaced NULL with nullptr 2015-07-07 22:46:15 +02:00
doc.hpp