James Booth 4503ee4be0 Merge branch 'master' into plugins ... Conflicts: src/command/commands.c src/event/client_events.c		2015-04-21 23:35:33 +01:00
..
client_events.c	Merge branch 'master' into plugins	2015-04-21 23:35:33 +01:00
client_events.h	Moved new chat win events to client events module	2015-04-21 23:28:52 +01:00
server_events.c	Merge branch 'master' into plugins	2015-04-19 17:32:04 +01:00
server_events.h	Renamed server event functions	2015-04-19 17:29:54 +01:00