cc9cii f1a58994c6 Merge branch 'master' into moveref ... Conflicts: apps/opencs/model/world/columns.hpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/ref.cpp apps/opencs/view/world/dialoguesubview.cpp apps/opencs/view/world/dialoguesubview.hpp apps/opencs/view/world/util.cpp components/esm/cellref.hpp		2015-04-25 06:52:53 +10:00
..
doc	Merge branch 'master' into moveref	2015-04-25 06:52:53 +10:00
filter	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
settings	added search-related user settings	2015-03-30 22:30:33 +02:00
tools	Merge branch 'replace'	2015-04-16 20:11:25 +02:00
world	Merge branch 'master' into moveref	2015-04-25 06:52:53 +10:00