James Booth 0fa43596ba Merge branch 'master' into plugins ... Conflicts: configure.ac src/profanity.c		2014-05-02 00:57:15 +01:00
..
command	Merge branch 'master' into plugins	2014-04-26 00:37:37 +01:00
config	Merge branch 'master' into plugins	2014-04-26 00:37:37 +01:00
otr	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
plugins	Merge branch 'master' into plugins	2014-04-09 22:48:01 +01:00
tools	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
ui	Merge branch 'master' into plugins	2014-04-26 00:37:37 +01:00
xmpp	Merge branch 'master' into plugins	2014-05-02 00:57:15 +01:00
chat_session.c	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
chat_session.h	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
common.c	Merge branch 'master' into plugins	2014-05-02 00:57:15 +01:00
common.h	Changed to use gnutls instead of openssl for sha1 hashing	2014-05-01 22:18:04 +01:00
contact.c	Updated copyright	2014-03-09 01:18:19 +00:00
contact.h	Updated copyright	2014-03-09 01:18:19 +00:00
jid.c	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
jid.h	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
log.c	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
log.h	Added /log where command	2014-04-13 22:20:15 +01:00
main.c	Merge branch 'master' into plugins	2014-04-23 23:01:58 +01:00
muc.c	Fixed cppcheck warnings	2014-04-26 00:36:36 +01:00
muc.h	Rejoin private rooms after reconnecting	2014-04-23 22:19:14 +01:00
profanity.c	Merge branch 'master' into plugins	2014-05-02 00:57:15 +01:00
profanity.h	Merge branch 'master' into plugins	2014-03-09 01:22:13 +00:00
resource.c	Updated copyright	2014-03-09 01:18:19 +00:00
resource.h	Updated copyright	2014-03-09 01:18:19 +00:00
roster_list.c	Updated copyright	2014-03-09 01:18:19 +00:00
roster_list.h	Updated copyright	2014-03-09 01:18:19 +00:00
server_events.c	Merge branch 'master' into plugins	2014-04-23 23:01:58 +01:00
server_events.h	Chat room windows now created only after successful join	2014-04-21 00:37:04 +01:00