Marc Zinnschlag c626e2b257 Merge branch 'ref' ...

Conflicts:
	apps/opencs/view/doc/view.hpp

2013-05-19 14:59:01 +02:00

..

doc

Merge remote-tracking branch 'graffy76/usersettings'

2013-05-16 18:04:55 +02:00

settings

Moved signalUpdateEditorSettings from UserSettingsDialog to

2013-05-12 15:15:57 -05:00

tools

added verifier for spell record

2013-04-09 12:44:49 +02:00

world

added missing columns for weapon records

2013-05-19 14:44:41 +02:00