1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
profanity/src/event
James Booth 1f90aca503 Merge branch 'master' into plugins-c
Conflicts:
	src/main.c
	src/ui/console.c
2016-02-14 23:00:52 +00:00
..
client_events.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
client_events.h Updated copyright 2016-02-14 22:54:46 +00:00
server_events.c Merge branch 'master' into plugins-c 2016-02-14 23:00:52 +00:00
server_events.h Updated copyright 2016-02-14 22:54:46 +00:00