scrawl f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/launcher/CMakeLists.txt apps/opencs/CMakeLists.txt apps/opencs/view/render/worldspacewidget.cpp apps/openmw/CMakeLists.txt components/CMakeLists.txt extern/osg-ffmpeg-videoplayer/CMakeLists.txt		2015-06-13 21:11:24 +02:00
..
CMakeLists.txt	Refactor cmake scripts, reducing the amount of find_package(Boost)	2015-06-12 01:45:19 +02:00
convertacdt.cpp	fixing MSVC 2013 warning C4244: & C4305	2015-03-08 13:07:29 +13:00
convertacdt.hpp
convertcntc.cpp
convertcntc.hpp
convertcrec.cpp
convertcrec.hpp
converter.cpp	Remove last remains of Ogre	2015-06-03 23:04:35 +02:00
converter.hpp	Remove last remains of Ogre	2015-06-03 23:04:35 +02:00
convertinventory.cpp
convertinventory.hpp
convertnpcc.cpp
convertnpcc.hpp
convertplayer.cpp	ESSImport: import player skill progress	2015-02-06 01:27:17 +01:00
convertplayer.hpp
convertscpt.cpp
convertscpt.hpp
convertscri.cpp
convertscri.hpp
importacdt.cpp
importacdt.hpp	ESSImport: note location of corpse clear countdown	2015-02-14 12:00:16 +01:00
importcellref.cpp	fixed MSVC 2013 warning C4800	2015-03-06 23:19:57 +13:00
importcellref.hpp
importcntc.cpp
importcntc.hpp
importcrec.cpp	ESSImport: read AiPackages	2015-02-14 12:25:52 +01:00
importcrec.hpp	ESSImport: read AiPackages	2015-02-14 12:25:52 +01:00
importdial.cpp
importdial.hpp
importer.cpp	Remove last remains of Ogre	2015-06-03 23:04:35 +02:00
importer.hpp
importercontext.cpp
importercontext.hpp
importgame.cpp
importgame.hpp
importinfo.cpp
importinfo.hpp
importinventory.cpp
importinventory.hpp
importjour.cpp
importjour.hpp
importklst.cpp
importklst.hpp
importnpcc.cpp	ESSImport: read AiPackages	2015-02-14 12:25:52 +01:00
importnpcc.hpp	ESSImport: read AiPackages	2015-02-14 12:25:52 +01:00
importplayer.cpp
importplayer.hpp	ESSImport: note where skill progress is stored (not converted yet)	2015-01-31 22:40:39 +01:00
importques.cpp
importques.hpp
importscpt.cpp
importscpt.hpp
importscri.cpp
importscri.hpp
main.cpp