James Booth b64a5aca10 Merge branch 'master' into plugins ... Conflicts: src/event/client_events.c		2015-05-04 01:10:20 +01:00
..
client_events.c	Merge branch 'master' into plugins	2015-05-04 01:10:20 +01:00
client_events.h	cl_ev_send_muc_msg takes ProfMucWin as arg	2015-05-04 01:06:12 +01:00
server_events.c	Merge branch 'master' into plugins	2015-05-03 01:25:47 +01:00
server_events.h	Extract private message hanlding in message.c	2015-05-03 01:25:33 +01:00
ui_events.c	Move current win check to event, removed next and prev win functions	2015-04-30 22:43:08 +01:00
ui_events.h	Return result on OTR message sending	2015-04-29 22:59:44 +01:00