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

Merge branch 'master' into NonTableFields

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

filter

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

render

improved performance of CSVRender::Cell::addObjects by bypassing Qt model

2015-03-31 14:25:27 +02:00

settings

Merge branch 'settings'

2014-10-19 13:44:15 +02:00

tools

added replace all button

2015-04-16 20:11:14 +02:00

widget

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

world

Merge branch 'master' into NonTableFields

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