Stanislav Bas 297373f436 Add the configuration widget to the bottom box ...

Conflicts:
	apps/opencs/view/world/tablebottombox.cpp

2015-07-30 09:24:28 +10:00

..

doc

Merge branch 'master' into cc9cii

2015-07-27 10:53:39 +10:00

filter

fix -Wnewline-eof warnings

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

render

Add support to build with Qt5 (Task #2665)

2015-06-12 15:13:42 +02:00

settings

Add support to build with Qt5 (Task #2665)

2015-06-12 15:13:42 +02:00

tools

improving consistency of subview layouts

2015-07-27 15:20:16 +10:00

widget

Proper conversion to QString for DropLineEdit::dropEvent()

2015-06-25 19:30:53 +03:00

world

Add the configuration widget to the bottom box

2015-07-30 09:24:28 +10:00