cc9cii f989bfcd42 Merge branch 'master' into cc9cii ... Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/table.cpp apps/opencs/view/world/table.hpp		2015-06-09 19:42:37 +10:00
..
doc	Merge branch 'master' into cc9cii	2015-06-09 19:42:37 +10:00
filter	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
render	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
settings	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
tools	focus search input field when opening search subview (Fixes #2534)	2015-05-14 14:48:29 +02:00
widget	Add missing new lines at the ends of files	2015-05-31 18:18:49 +03:00
world	Merge branch 'master' into cc9cii	2015-06-09 19:42:37 +10:00