James Booth 1706980fd7 Merge remote-tracking branch 'lucian/master' ...

Conflicts:
	src/server_events.c

2014-04-23 00:20:34 +01:00

..

command

Added /otr policy autocompletion

2014-04-23 00:01:18 +01:00

config

Merge remote-tracking branch 'lucian/master'

2014-04-22 23:53:15 +01:00

otr

Merge remote-tracking branch 'lucian/master'

2014-04-22 23:53:15 +01:00

tools

Simplified parse_options to take first option as argument

2014-04-15 00:27:55 +01:00

ui

Chat room windows now created only after successful join

2014-04-21 00:37:04 +01:00

xmpp

Merge remote-tracking branch 'lucian/master'

2014-04-22 23:53:15 +01:00

chat_session.c

Updated copyright

2014-03-09 01:18:19 +00:00

chat_session.h

Updated copyright

2014-03-09 01:18:19 +00:00

common.c

Updated copyright

2014-03-09 01:18:19 +00:00

common.h

Updated copyright

2014-03-09 01:18:19 +00:00

contact.c

Updated copyright

2014-03-09 01:18:19 +00:00

contact.h

Updated copyright

2014-03-09 01:18:19 +00:00

jid.c

Updated copyright

2014-03-09 01:18:19 +00:00

jid.h

Updated copyright

2014-03-09 01:18:19 +00:00

log.c

Added /log where command

2014-04-13 22:20:15 +01:00

log.h

Added /log where command

2014-04-13 22:20:15 +01:00

main.c

Removed inputwin functions from ui.h

2014-04-07 21:50:28 +01:00

muc.c

Chat room windows now created only after successful join

2014-04-21 00:37:04 +01:00

muc.h

Chat room windows now created only after successful join

2014-04-21 00:37:04 +01:00

profanity.c

Added /log rotate option

2014-04-13 20:41:11 +01:00

profanity.h

Updated copyright

2014-03-09 01:18:19 +00:00

resource.c

Updated copyright

2014-03-09 01:18:19 +00:00

resource.h

Updated copyright

2014-03-09 01:18:19 +00:00

roster_list.c

Updated copyright

2014-03-09 01:18:19 +00:00

roster_list.h

Updated copyright

2014-03-09 01:18:19 +00:00

server_events.c

Merge remote-tracking branch 'lucian/master'

2014-04-23 00:20:34 +01:00

server_events.h

Chat room windows now created only after successful join

2014-04-21 00:37:04 +01:00