James Booth 9aff8abd2e Merge branch 'master' into openpgp ...

Conflicts:
	.travis.yml

2015-06-05 23:02:56 +01:00

..

command

Merge branch 'master' into openpgp

2015-06-02 20:32:07 +01:00

config

Merge branch 'master' into openpgp

2015-06-05 23:02:56 +01:00

event

Merge branch 'master' into openpgp

2015-06-05 23:02:56 +01:00

otr

Added rooms iq test

2015-05-24 04:13:28 +01:00

pgp

Use null check convention in gpg.c

2015-05-04 23:41:22 +01:00

tools

Use null check convention in tinyurl.c

2015-05-04 22:57:49 +01:00

ui

Merge branch 'master' into openpgp

2015-06-05 23:02:56 +01:00

xmpp

Merge branch 'master' into openpgp

2015-06-05 23:02:56 +01:00

chat_session.c

Use null check convention in chat_session.c

2015-05-04 23:24:37 +01:00

chat_session.h

Updated copyright

2015-02-10 23:16:09 +00:00

chat_state.c

Updated copyright

2015-02-10 23:16:09 +00:00

chat_state.h

Updated copyright

2015-02-10 23:16:09 +00:00

common.c

Added more connect tests

2015-05-24 20:31:18 +01:00

common.h

Added more connect tests

2015-05-24 20:31:18 +01:00

contact.c

Optimised contact comparisons, create utf8 collate key once

2015-05-07 00:16:22 +01:00

contact.h

Optimised contact comparisons, create utf8 collate key once

2015-05-07 00:16:22 +01:00

jid.c

Use null check convention in jid.c

2015-05-04 23:27:41 +01:00

jid.h

Updated copyright

2015-02-10 23:16:09 +00:00

log.c

Use null check convention in log.c

2015-05-04 23:28:34 +01:00

log.h

Move common chat logging code to log.c

2015-03-15 23:19:00 +00:00

main.c

Added pgp key list command

2015-03-22 00:12:14 +00:00

muc.c

Optimised occupant comparisons, create utf8 collate key once

2015-05-07 00:26:24 +01:00

muc.h

Optimised occupant comparisons, create utf8 collate key once

2015-05-07 00:26:24 +01:00

profanity.c

Merge branch 'master' into openpgp

2015-06-05 23:02:56 +01:00

profanity.h

Updated copyright

2015-02-10 23:16:09 +00:00

resource.c

Use null check convention in resource.c

2015-05-04 23:29:53 +01:00

resource.h

Updated copyright

2015-02-10 23:16:09 +00:00

roster_list.c

Optimised contact comparisons, create utf8 collate key once

2015-05-07 00:16:22 +01:00

roster_list.h

Added roster list function to get display name for messages

2015-05-03 23:38:46 +01:00