1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-18 14:16:37 +00:00
openmw/components/files
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
..
androidpath.cpp release jni memory 2015-03-16 18:21:38 +04:00
androidpath.h change Jni name method 2015-02-26 18:30:14 +04:00
androidpath.hpp
collections.cpp
collections.hpp
configurationmanager.cpp Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
configurationmanager.hpp Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
constrainedfilestream.cpp Fix compile error 2015-02-27 19:58:43 +01:00
constrainedfilestream.hpp Multiple definition fix 2015-02-20 17:57:18 +01:00
fixedpath.hpp
linuxpath.cpp
linuxpath.hpp
lowlevelfile.cpp Tabs to spaces 2015-01-31 22:40:42 +01:00
lowlevelfile.hpp Tabs to spaces 2015-01-31 22:40:42 +01:00
macospath.cpp #2460: use Application Support as user data path on OS X 2015-03-18 23:48:03 +02:00
macospath.hpp
multidircollection.cpp
multidircollection.hpp
windowspath.cpp Installer work for Windows (Fixes #1621) 2015-03-15 08:08:55 +13:00
windowspath.hpp