Merged changes from trunk. It still compiles successfully. :-)
authorPhilipp Spitzer <philipp@spitzer.priv.at>
Tue, 13 Jan 2015 22:27:16 +0000 (22:27 +0000)
committerPhilipp Spitzer <philipp@spitzer.priv.at>
Tue, 13 Jan 2015 22:27:16 +0000 (22:27 +0000)
commit54b69e25c788102c591647d94d57f6d16fc32773
tree7a198e833ebef7761d50d56fcdea844133b2de12
parent4b6ae6bba4b999355afd902ef77c51902f095d0d
Merged changes from trunk. It still compiles successfully. :-)
69 files changed:
NEWS
README
confclerk.pro
data/confclerk.pod
src/alarm/alarm.cpp
src/alarm/alarm.h
src/app/application.cpp
src/app/application.h
src/app/appsettings.cpp
src/app/appsettings.h
src/app/main.cpp
src/global.pri
src/gui/about.ui
src/gui/conferenceeditor.cpp
src/gui/conferenceeditor.h
src/gui/conflictdialogcontainer.cpp
src/gui/conflictdialogcontainer.h
src/gui/conflictsdialog.cpp
src/gui/conflictsdialog.h
src/gui/daynavigatorwidget.cpp
src/gui/daynavigatorwidget.h
src/gui/dayviewtabcontainer.cpp
src/gui/dayviewtabcontainer.h
src/gui/errormessage.cpp
src/gui/errormessage.h
src/gui/eventdialog.cpp
src/gui/eventdialog.h
src/gui/favtabcontainer.cpp
src/gui/favtabcontainer.h
src/gui/mainwindow.cpp
src/gui/mainwindow.h
src/gui/roomstabcontainer.cpp
src/gui/roomstabcontainer.h
src/gui/searchhead.cpp
src/gui/searchhead.h
src/gui/searchtabcontainer.cpp
src/gui/searchtabcontainer.h
src/gui/settingsdialog.cpp
src/gui/settingsdialog.h
src/gui/tabcontainer.cpp
src/gui/tabcontainer.h
src/gui/trackstabcontainer.cpp
src/gui/trackstabcontainer.h
src/gui/urlinputdialog.cpp
src/gui/urlinputdialog.h
src/mvc/conference.cpp
src/mvc/conference.h
src/mvc/conferencemodel.cpp
src/mvc/conferencemodel.h
src/mvc/delegate.cpp
src/mvc/delegate.h
src/mvc/event.cpp
src/mvc/event.h
src/mvc/eventmodel.cpp
src/mvc/eventmodel.h
src/mvc/room.cpp
src/mvc/room.h
src/mvc/track.cpp
src/mvc/track.h
src/mvc/treeview.cpp
src/mvc/treeview.h
src/orm/ormrecord.h
src/sql/schedulexmlparser.cpp
src/sql/schedulexmlparser.h
src/sql/sqlengine.cpp
src/sql/sqlengine.h
src/test/main.cpp
src/test/mvc/eventtest.cpp
src/test/mvc/eventtest.h