Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp		2013-11-10 13:21:39 +01:00
..
doc	Fixed merge conflicts with saving branch	2013-10-25 19:23:03 -05:00
filter	allow float values in cell for value tests	2013-10-14 11:15:36 +02:00
settings	Fixed setting synchronization issue	2013-07-17 20:19:01 -05:00
tools	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
world	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00