aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
1f90aca503
profanity/src/xmpp
History
James Booth 1f90aca503 Merge branch 'master' into plugins-c 
Conflicts:
	src/main.c
	src/ui/console.c
2016-02-14 23:00:52 +00:00
..
bookmark.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
bookmark.h Updated copyright 2016-02-14 22:54:46 +00:00
capabilities.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
capabilities.h Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
connection.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
connection.h Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
form.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
form.h Updated copyright 2016-02-14 22:54:46 +00:00
iq.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
iq.h Updated copyright 2016-02-14 22:54:46 +00:00
message.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
message.h Updated copyright 2016-02-14 22:54:46 +00:00
presence.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
presence.h Updated copyright 2016-02-14 22:54:46 +00:00
roster.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
roster.h Updated copyright 2016-02-14 22:54:46 +00:00
stanza.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
stanza.h Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
xmpp.h Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00