cc9cii 47d5eac290 Merge branch 'master' into NonTableFields ...

Conflicts:
	apps/opencs/model/world/columnbase.cpp
	apps/opencs/model/world/columnbase.hpp
	apps/opencs/model/world/idtable.hpp

2015-04-17 12:37:34 +10:00

..

doc

added search stages (cell table only for now)

2015-03-27 16:33:54 +01: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 NonTableFields

2015-04-17 12:37:34 +10:00