scrawl 469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw ... Conflicts: apps/openmw/mwgui/levelupdialog.cpp		2014-07-24 02:33:46 +02:00
..
model	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-07-24 02:33:46 +02:00
view	added tooltips to dialgoue subview buttons	2014-07-15 12:46:52 +02:00
CMakeLists.txt	custom push button	2014-07-10 11:03:55 +02:00
editor.cpp	added resources manager	2014-07-04 12:46:57 +02:00
editor.hpp	Merge branch 'master' into load	2014-05-03 14:36:06 +02:00
main.cpp	Merge branch 'operations' into load	2014-05-08 13:17:24 +02:00