1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
profanity/src
James Booth 5ea9dd8043 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
2014-01-12 19:32:08 +00:00
..
command Merge branch 'master' into plugins 2014-01-12 19:32:08 +00:00
config Merge branch 'master' into plugins 2014-01-02 02:19:06 +00:00
plugins Added --enable-c-plugins to configure.ac 2014-01-07 23:58:47 +00:00
tools Added comments to autocomplete.h 2013-12-10 00:06:00 +00:00
ui Merge branch 'master' into plugins 2014-01-12 19:32:08 +00:00
xmpp Merge branch 'master' into plugins 2014-01-06 00:08:06 +00:00
chat_session.c removed assignment to NULL in _chat_session_free 2013-08-03 15:31:54 +03:00
chat_session.h Moved ChatSession typedef 2013-01-12 19:51:32 +00:00
common.c Merge branch 'master' into plugins 2013-08-30 01:04:17 +01:00
common.h Removed limit on number of windows, WIP 2013-08-27 23:38:25 +01:00
contact.c Added contact presence offline test 2014-01-05 00:43:37 +00:00
contact.h Merge branch 'master' into refactor2 2013-11-11 20:51:35 +00:00
jid.c most FREE_SET_NULL replaced with free 2013-08-03 14:27:07 +03:00
jid.h Renamed function in jid 2013-01-27 02:00:55 +00:00
log.c fixed segfault when home directory doesn't exist 2014-01-03 20:43:07 +02:00
log.h Moved handle_login_account_success to server_events 2014-01-05 20:58:19 +00:00
main.c Merge branch 'master' into plugins 2014-01-02 02:19:06 +00:00
muc.c Fixe rejoining room after nickname conflict 2013-09-22 01:26:40 +01:00
muc.h Handle when servers dont send status 101 or jid for MUC nick changes 2013-08-05 21:20:07 +01:00
otr.c Removed debug statements 2014-01-12 02:20:03 +00:00
otr.h Added /otr trust|untrust commands 2014-01-12 01:20:22 +00:00
profanity.c Merge branch 'master' into plugins 2014-01-12 19:32:08 +00:00
profanity.h Merge branch 'master' into plugins 2014-01-06 00:08:06 +00:00
resource.c most FREE_SET_NULL replaced with free 2013-08-03 14:27:07 +03:00
resource.h Show all resources ordered by priority with /info command 2013-02-17 00:05:57 +00:00
roster_list.c Refactored roster add/update 2014-01-05 23:54:29 +00:00
roster_list.h Refactored roster add/update 2014-01-05 23:54:29 +00:00
server_events.c Merge branch 'master' into plugins 2014-01-12 19:32:08 +00:00
server_events.h Refactored roster add/update 2014-01-05 23:54:29 +00:00