James Booth 8c97658b8d Merge branch 'master' into refactor2 ...

Conflicts:
	src/ui/core.c

2013-11-11 20:51:35 +00:00

..

command

Added /account set <account> password <password>

2013-11-07 23:36:04 +00:00

config

Added /account set <account> password <password>

2013-11-07 23:36:04 +00:00

tools

Moved free in parse_args_with_freetext

2013-09-23 01:19:54 +01:00

ui

Merge branch 'master' into refactor2

2013-11-11 20:51:35 +00:00

xmpp

Fixed compile error for -Wduplicate-decl-specifier on OSX

2013-11-10 18:48:55 +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

Fixes to windows tidy

2013-08-28 23:09:54 +01:00

common.h

Removed limit on number of windows, WIP

2013-08-27 23:38:25 +01:00

contact.c

Added p_contact_create_display_string

2013-10-07 00:16:58 +01: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 memory leak in groupchat logging

2013-09-23 01:37:57 +01:00

log.h

Added groupchat logs

2013-05-05 00:16:10 +01:00

main.c

Merge remote-tracking branch 'tsenart/connect-on-startup'

2013-11-07 21:57:41 +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

profanity.c

Merge branch 'master' into refactor2

2013-11-11 20:51:35 +00:00

profanity.h

Connect to an account on start-up

2013-10-14 21:22:46 +02: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