ToastFreeware Gitweb - debian/confclerk.git/commit

ToastFreeware / debian / confclerk.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 54b69e2 4a87a3b)

author	gregor herrmann <gregoa@debian.org>
	Wed, 11 Jan 2017 20:35:17 +0000 (21:35 +0100)
committer	gregor herrmann <gregoa@debian.org>
	Wed, 11 Jan 2017 20:35:17 +0000 (21:35 +0100)
commit	ebe26af4f4448f1c3dd125c63da6cc080541a6b5
tree	38a86f40efd2921c16891eb7b6e6344f6740ad92	tree \| snapshot
parent	54b69e25c788102c591647d94d57f6d16fc32773	commit \| diff
parent	4a87a3b569b03e6e3ccb9a2004e31ddc43d4df5d	commit \| diff

Merge branch 'master' into qt5

src/gui/eventdialog.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/mainwindow.h	diff1 \|	diff2 \|	blob \| history
src/gui/searchhead.h	diff1 \|	diff2 \|	blob \| history
src/mvc/conferencemodel.h	diff1 \|	diff2 \|	blob \| history
src/mvc/delegate.cpp	diff1 \|	diff2 \|	blob \| history
src/mvc/delegate.h	diff1 \|	diff2 \|	blob \| history
src/mvc/eventmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/sqlengine.cpp	diff1 \|	diff2 \|	blob \| history

Debian package confclerk