1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
profanity/src
James Booth 5f5c8122d0 Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
2016-01-23 23:02:51 +00:00
..
command Merge branch 'master' into plugins 2016-01-23 23:02:51 +00:00
config Merge branch 'master' into plugins 2016-01-23 23:02:51 +00:00
event Merge branch 'master' into plugins 2016-01-14 22:55:05 +00:00
otr Added roster struct, create and destroy roster on connect/disconnect 2016-01-05 00:06:50 +00:00
pgp Merge branch 'master' into plugins 2015-12-15 00:42:35 +00:00
plugins Merge branch 'master' into plugins 2015-11-02 21:27:33 +00:00
tools Added sys/select.h header includes 2016-01-19 22:55:43 +00:00
ui Merge branch 'master' into plugins 2016-01-23 23:02:51 +00:00
xmpp Merge branch 'master' into plugins 2016-01-13 22:25:59 +00:00
chat_session.c Applied coding style to src/ 2015-10-26 00:52:33 +00:00
chat_session.h Applied coding style to src/ 2015-10-26 00:52:33 +00:00
chat_state.c Applied coding style to src/ 2015-10-26 00:52:33 +00:00
chat_state.h Use consistent style for pointers 2015-10-21 15:07:49 +02:00
common.c Merge branch 'master' into plugins 2016-01-19 22:59:40 +00:00
common.h Applied coding style to src/ 2015-10-26 00:52:33 +00:00
contact.c Applied coding style to src/ 2015-10-26 00:52:33 +00:00
contact.h Applied coding style to src/ 2015-10-26 00:52:33 +00:00
jid.c Applied coding style to src/ 2015-10-26 00:52:33 +00:00
jid.h Use consistent style for pointers 2015-10-21 15:07:49 +02:00
log.c Applied coding style to src/ 2015-10-26 00:52:33 +00:00
log.h Applied coding style to src/ 2015-10-26 00:52:33 +00:00
main.c Merge branch 'master' into plugins 2015-10-31 23:51:34 +00:00
muc.c Fix pointer dereferencing 2015-10-26 14:24:11 +01:00
muc.h Applied coding style to src/ 2015-10-26 00:52:33 +00:00
profanity.c Merge branch 'master' into plugins 2016-01-05 01:43:18 +00:00
profanity.h Merge branch 'master' into plugins 2015-11-10 23:28:19 +00:00
resource.c Applied coding style to src/ 2015-10-26 00:52:33 +00:00
resource.h Applied coding style to src/ 2015-10-26 00:52:33 +00:00
roster_list.c Added roster struct, create and destroy roster on connect/disconnect 2016-01-05 00:06:50 +00:00
roster_list.h Added roster struct, create and destroy roster on connect/disconnect 2016-01-05 00:06:50 +00:00
window_list.c Merge branch 'master' into plugins 2016-01-13 23:19:57 +00:00
window_list.h Merge branch 'master' into plugins 2016-01-13 23:19:57 +00:00