1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
profanity/src
James Booth 5d827cafec Merge branch 'master' into pgp
Conflicts:
	src/xmpp/message.c
2015-04-28 23:57:28 +01:00
..
command Merge branch 'master' into pgp 2015-04-28 23:57:28 +01:00
config Merge branch 'master' into pgp 2015-04-23 23:48:43 +01:00
event Added ui events module 2015-04-28 23:53:37 +01:00
otr Moved otr message send event to otr module 2015-04-27 23:30:33 +01:00
pgp Decrypt incoming messages 2015-03-25 00:05:32 +00:00
tools Merge branch 'master' into readline 2015-02-23 00:50:58 +00:00
ui Merge branch 'master' into pgp 2015-04-28 23:57:28 +01:00
xmpp Merge branch 'master' into pgp 2015-04-28 23:57:28 +01:00
chat_session.c Fixed spelling. 2015-02-17 10:52:37 +01:00
chat_session.h Updated copyright 2015-02-10 23:16:09 +00:00
chat_state.c Updated copyright 2015-02-10 23:16:09 +00:00
chat_state.h Updated copyright 2015-02-10 23:16:09 +00:00
common.c Moved _strtoi to common, strtoi_range 2015-03-16 01:06:40 +00:00
common.h Moved _strtoi to common, strtoi_range 2015-03-16 01:06:40 +00:00
contact.c Updated copyright 2015-02-10 23:16:09 +00:00
contact.h Updated copyright 2015-02-10 23:16:09 +00:00
jid.c Fixed create_fulljid 2015-02-23 23:52:53 +00:00
jid.h Updated copyright 2015-02-10 23:16:09 +00:00
log.c Move common chat logging code to log.c 2015-03-15 23:19:00 +00:00
log.h Move common chat logging code to log.c 2015-03-15 23:19:00 +00:00
main.c Added pgp key list command 2015-03-22 00:12:14 +00:00
muc.c Use password for chat room invites 2015-03-29 03:16:41 +01:00
muc.h Use password for chat room invites 2015-03-29 03:16:41 +01:00
profanity.c Added signature verification, /pgp fps command 2015-03-24 00:47:13 +00:00
profanity.h Updated copyright 2015-02-10 23:16:09 +00:00
resource.c Updated copyright 2015-02-10 23:16:09 +00:00
resource.h Updated copyright 2015-02-10 23:16:09 +00:00
roster_list.c Lowercase barejid before searching roster 2015-02-23 23:30:13 +00:00
roster_list.h Updated copyright 2015-02-10 23:16:09 +00:00