313 Commits

Author	SHA1	Message	Date
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	c76692516a	Merge branch 'master' into openpgp	2015-06-15 20:39:17 +01:00
James Booth	5cdd69f478	Moved UI interfaces to ui.h	2015-06-15 20:11:34 +01:00
James Booth	10a5f29023	Merge branch 'master' into openpgp	2015-06-14 00:02:00 +01:00
James Booth	e50461a897	Set columns when running functional tests	2015-06-13 23:59:33 +01:00
James Booth	c2c2cee6c9	Moved stub_gpg.c	2015-06-12 23:58:44 +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