Marc Zinnschlag ef1e01639e added UI for merge tool (merge tool itself is still missing) ... (cherry picked from commit b83f9445a9) Conflicts: apps/opencs/editor.cpp apps/opencs/editor.hpp		2015-11-01 13:22:42 +11:00
..
doc	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
filter	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
render	Fix the ESM::LandTexture NAME being discarded on loading	2015-09-08 06:42:45 +10:00
settings	Add support to build with Qt5 (Task #2665)	2015-06-12 15:13:42 +02:00
tools	added UI for merge tool (merge tool itself is still missing)	2015-11-01 13:22:42 +11:00
widget	Remove empty line at the beginning of files	2015-09-08 06:40:06 +10:00
world	Columns with Display_Boolean use Combobox editor even for non-boolean values	2015-09-08 06:46:21 +10:00