Merge branch 'master' into qt5
authorgregor herrmann <gregor@toastfreeware.priv.at>
Wed, 30 Aug 2017 18:38:27 +0000 (20:38 +0200)
committergregor herrmann <gregor@toastfreeware.priv.at>
Wed, 30 Aug 2017 18:38:27 +0000 (20:38 +0200)
commit809b5e5774aa31127a62699a4cdd960b2f9892b0
tree626a1c1dc68942d8488088bdd2a97aace7b236ee
parentebe26af4f4448f1c3dd125c63da6cc080541a6b5
parente27a3f524935bca516dc52fd6e64e6dc4d3bf5b4
Merge branch 'master' into qt5
src/gui/eventdialog.cpp
src/gui/mainwindow.h
src/gui/searchhead.h
src/mvc/conferencemodel.h
src/mvc/delegate.cpp
src/mvc/delegate.h
src/mvc/eventmodel.cpp
src/sql/sqlengine.cpp