Marc Zinnschlag 01497ac8db Merge remote-tracking branch 'origin/master'

2016-02-24 13:37:34 +01:00

..

model

Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements'

2016-02-24 13:37:16 +01:00

view

Merge remote-tracking branch 'origin/master'

2016-02-24 13:37:34 +01:00

CMakeLists.txt

Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements'

2016-02-24 13:37:16 +01:00

editor.cpp

Read fallback settings in OpenCS

2016-01-11 23:10:16 +01:00

editor.hpp

removed old user settings system

2015-12-15 12:49:55 +01:00

main.cpp

OS X: do not override Qt plugin path

2015-11-14 13:50:01 +01:00