James Booth d612b9695a Merge branch 'master' into pgp ...

Conflicts:
	src/xmpp/message.c

2015-04-19 17:33:35 +01:00

..

bookmark.c

Moved server_events to event/

2015-04-19 16:54:16 +01:00

bookmark.h

Updated copyright

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

capabilities.c

Updated copyright

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

capabilities.h

Updated copyright

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

connection.c

Renamed server event functions

2015-04-19 17:29:54 +01:00

connection.h

Updated copyright

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

form.c

Updated copyright

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

form.h

Updated copyright

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

iq.c

Renamed server event functions

2015-04-19 17:29:54 +01:00

iq.h

Updated copyright

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

message.c

Merge branch 'master' into pgp

2015-04-19 17:33:35 +01:00

message.h

Updated copyright

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

presence.c

Merge branch 'master' into pgp

2015-04-19 17:33:35 +01:00

presence.h

Updated copyright

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

roster.c

Renamed server event functions

2015-04-19 17:29:54 +01:00

roster.h

Updated copyright

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

stanza.c

Added password to direct invites

2015-03-29 02:46:59 +01:00

stanza.h

Merge branch 'master' into pgp

2015-03-29 02:51:05 +01:00

xmpp.h

Add callback data to room disco info response handler

2015-03-29 00:55:33 +00:00