scrawl 62774fcc4a Merge branch 'master' into HEAD ... Conflicts: apps/openmw/mwbase/world.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/loadtes3.cpp		2014-01-06 00:23:17 +01:00
..
model	Merge branch 'master' into HEAD	2014-01-06 00:23:17 +01:00
view	journals subview was bound to the wrong universal ID type	2013-12-02 16:25:26 +01:00
CMakeLists.txt	remove unneeded libraries	2013-12-29 16:25:49 -05:00
editor.cpp	XDG compliant paths	2013-12-26 20:53:51 +01:00
editor.hpp	Fix for file path issues	2013-10-26 22:55:44 -05:00
main.cpp	Change destruction order - fixes a shutdown crash discovered with mesa	2013-12-26 20:53:52 +01:00