12 Commits

Author	SHA1	Message	Date
James Booth	446027b950	Moved setting otr.warn -> enc.warn	2015-06-21 21:07:57 +01:00
James Booth	e45afd5c09	Added pgp checks for message sending	2015-06-21 01:48:25 +01:00
James Booth	1af3565cbd	Merge branch 'master' into openpgp	2015-06-17 19:55:52 +01:00
James Booth	e00a03f916	Removed wins_get_current_* functions	2015-06-17 19:49:55 +01:00
James Booth	8fde14879a	Merge branch 'master' into openpgp ... Conflicts: src/command/commands.c src/command/commands.h	2015-06-17 00:40:06 +01:00
James Booth	2215a3791f	Added current window reference to command functions	2015-06-17 00:15:28 +01:00
James Booth	637b8bee9f	Merge branch 'master' into openpgp	2015-06-15 23:17:11 +01:00
James Booth	fb0e065902	Tidied cmd_otr, added check-unit target to Makefile	2015-06-15 23:16:22 +01:00
James Booth	de47450594	Merge branch 'master' into openpgp	2015-06-15 22:03:25 +01:00
James Booth	6097a5bade	Removed ui_get_current_chat()	2015-06-15 22:01:28 +01:00
James Booth	efb07f8187	Merge branch 'master' into openpgp	2015-06-12 23:55:28 +01:00
James Booth	68ed20f10d	Moved all tests to tests folder	2015-06-12 23:53:30 +01:00