mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 19:29:56 +00:00
Code Issues Releases Wiki Activity
openmw/apps
History
scrawl 236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
2015-03-27 17:30:48 +01:00
..
bsatool Several warning fixes 2015-01-23 15:34:47 +01:00
esmtool Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
essimporter fixing MSVC 2013 warning C4244: & C4305 2015-03-08 13:07:29 +13:00
launcher Merge remote-tracking branch 'dteviot/Bug2344' 2015-02-26 19:05:30 +01:00
mwiniimporter fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
nifosgtest Don't set the root node to dynamic 2015-03-26 00:11:23 +01:00
opencs Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
openmw Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
openmw_test_suite UnitTests: add another dialogue keyword test 2015-01-10 00:29:07 +01:00
wizard Installer work for Windows (Fixes #1621) 2015-03-15 08:08:55 +13:00
doc.hpp