7 commits

Author	SHA1	Message	Date
Stephen Birarda	1c861fbecb	resolve conflicts on merge with upstream master	2014-04-09 15:36:15 -07:00
Stephen Birarda	6ce5a24460	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00
Stephen Birarda	ff9fd2d8e9	tweak headers in cmake find modules	2014-04-08 17:49:30 -07:00
Stephen Birarda	dc38b27485	using GnuTLS read self-signed key and cert on DS load	2014-03-31 12:31:34 -07:00
Dimitar Dobrev	e10dacdbfe	Changed the searcning for qxmpp to include debug libraries as well.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	86643803cf	Moved the connection and configuration of XMPP to the log-in process.	2014-03-12 01:24:30 +02:00
Dimitar Dobrev	1c2e752f3c	Integrated QXmpp in the build system.	2014-03-12 01:16:10 +02:00