James Booth 6edf3b3f94 Merge branch 'master' into mention-config

2016-04-04 23:44:04 +01:00

..

command

Added reset to /notify help

2016-04-04 23:41:30 +01:00

config

Added mention match preferences

2016-04-03 23:33:21 +01:00

event

Added mention match preferences

2016-04-03 23:33:21 +01:00

otr

Updated copyright

2016-02-14 22:54:46 +00:00

pgp

Removed #AX_PREFIX_CONFIG_H

2016-03-31 21:05:02 +01:00

plugins

Removed #AX_PREFIX_CONFIG_H

2016-03-31 21:05:02 +01:00

tools

Updated copyright

2016-02-14 22:54:46 +00:00

ui

Removed newline handling code from rosterwin.c

2016-03-31 23:14:51 +01:00

xmpp

Fix typo: diso -> disco

2016-04-01 12:09:35 +02:00

chat_session.c

Updated copyright

2016-02-14 22:54:46 +00:00

chat_session.h

Updated copyright

2016-02-14 22:54:46 +00:00

chat_state.c

Updated copyright

2016-02-14 22:54:46 +00:00

chat_state.h

Updated copyright

2016-02-14 22:54:46 +00:00

common.c

Added prof_strstr function

2016-04-03 22:30:24 +01:00

common.h

Added prof_strstr function

2016-04-03 22:30:24 +01:00

contact.c

Updated copyright

2016-02-14 22:54:46 +00:00

contact.h

Updated copyright

2016-02-14 22:54:46 +00:00

jid.c

Updated copyright

2016-02-14 22:54:46 +00:00

jid.h

Updated copyright

2016-02-14 22:54:46 +00:00

log.c

Updated copyright

2016-02-14 22:54:46 +00:00

log.h

Updated copyright

2016-02-14 22:54:46 +00:00

main.c

Removed #AX_PREFIX_CONFIG_H

2016-03-31 21:05:02 +01:00

muc.c

Updated copyright

2016-02-14 22:54:46 +00:00

muc.h

Updated copyright

2016-02-14 22:54:46 +00:00

profanity.c

Removed #AX_PREFIX_CONFIG_H

2016-03-31 21:05:02 +01:00

profanity.h

Merge branch 'master' into plugins-c

2016-02-14 23:00:52 +00:00

resource.c

Updated copyright

2016-02-14 22:54:46 +00:00

resource.h

Updated copyright

2016-02-14 22:54:46 +00:00

roster_list.c

Updated copyright

2016-02-14 22:54:46 +00:00

roster_list.h

Updated copyright

2016-02-14 22:54:46 +00:00

window_list.c

Removed #AX_PREFIX_CONFIG_H

2016-03-31 21:05:02 +01:00

window_list.h

Merge branch 'master' into plugins-c

2016-02-14 23:00:52 +00:00