1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
profanity/src/xmpp
James Booth 2c7f6c16aa Merge branch 'master' into plugins
Conflicts:
	src/main.c
	src/ui/console.c
2014-03-09 01:22:13 +00:00
..
bookmark.c Updated copyright 2014-03-09 01:18:19 +00:00
bookmark.h Updated copyright 2014-03-09 01:18:19 +00:00
capabilities.c Merge branch 'master' into plugins 2014-03-09 01:22:13 +00:00
capabilities.h Updated copyright 2014-03-09 01:18:19 +00:00
connection.c Merge branch 'master' into plugins 2014-03-09 01:22:13 +00:00
connection.h Updated copyright 2014-03-09 01:18:19 +00:00
iq.c Merge branch 'master' into plugins 2014-03-09 01:22:13 +00:00
iq.h Updated copyright 2014-03-09 01:18:19 +00:00
message.c Updated copyright 2014-03-09 01:18:19 +00:00
message.h Updated copyright 2014-03-09 01:18:19 +00:00
presence.c Updated copyright 2014-03-09 01:18:19 +00:00
presence.h Updated copyright 2014-03-09 01:18:19 +00:00
roster.c Merge branch 'master' into plugins 2014-03-09 01:22:13 +00:00
roster.h Updated copyright 2014-03-09 01:18:19 +00:00
stanza.c Updated copyright 2014-03-09 01:18:19 +00:00
stanza.h Updated copyright 2014-03-09 01:18:19 +00:00
xmpp.h Updated copyright 2014-03-09 01:18:19 +00:00