1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-08-11 18:54:16 -04:00
profanity/src
James Booth bca5a5f78d Merge branch 'master' into muc_roles
Conflicts:
	.gitignore
2014-09-30 20:46:26 +01:00
..
command Changed rooms to use Occupant type instead of PContact 2014-09-30 00:16:01 +01:00
config Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
otr Always update UI in event loop, removed updates from rest of code 2014-09-01 19:14:52 +01:00
tools Check for NULL inside autocomplete_free 2014-09-26 00:48:48 +01:00
ui Merge branch 'master' into muc_roles 2014-09-30 20:46:26 +01:00
xmpp Merge branch 'master' into muc_roles 2014-09-30 20:46:26 +01:00
chat_session.c Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
chat_session.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
common.c Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
common.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
contact.c Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
contact.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
jid.c Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
jid.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
log.c Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
log.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
main.c Rewrite form parser 2014-09-06 22:40:57 +01:00
muc.c wip - Store roles and affiliations with occupants 2014-09-30 19:46:35 +01:00
muc.h wip - Store roles and affiliations with occupants 2014-09-30 19:46:35 +01:00
profanity.c Always update UI in event loop, removed updates from rest of code 2014-09-01 19:14:52 +01:00
profanity.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
resource.c Added jid->hash lookup for capabilities 2014-09-20 23:50:19 +01:00
resource.h Added jid->hash lookup for capabilities 2014-09-20 23:50:19 +01:00
roster_list.c Renamed autocomplete function to get list 2014-09-26 00:06:50 +01:00
roster_list.h Added license exemption for OpenSSL to source headers 2014-08-24 20:57:39 +01:00
server_events.c wip - Store roles and affiliations with occupants 2014-09-30 19:46:35 +01:00
server_events.h wip - Store roles and affiliations with occupants 2014-09-30 19:46:35 +01:00