Marc Zinnschlag 23ccee0124 Merge remote-tracking branch 'dieho/master' ...

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

2015-08-08 11:00:44 +02:00

..

doc

Merge remote-tracking branch 'dieho/master'

2015-08-08 11:00:44 +02:00

filter

fix -Wnewline-eof warnings

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

render

Fix the OpenCS rendering crash on exit (Fixes #2735)

2015-07-18 03:52:48 +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-14 11:49:41 +02:00

widget

Proper conversion to QString for DropLineEdit::dropEvent()

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

world

Merge remote-tracking branch 'dieho/master'

2015-08-08 11:00:44 +02:00