7 Commits

Author	SHA1	Message	Date
Jfreegman	1f7f4490b2	merge with master	2015-07-08 21:09:58 -04:00
Jfreegman	2d3c5c9450	Mostly finished with new API port ... - File transfers currently don't support pausing/resuming - Avatars are not yet done	2015-03-28 02:56:54 -04:00
Jfreegman	4365b8d5ad	update man page	2014-12-27 13:17:05 -05:00
Jfreegman	9ee7a48910	add setting to disable welcome message	2014-09-19 01:11:23 -04:00
Jfreegman	919d36369c	add option to unencrypt an encrypted data file	2014-09-18 23:50:51 -04:00
Jfreegman	388d78d11e	add option to encrypt an existing unencrypted data file	2014-09-15 16:17:58 -04:00
Loui Chang	97d4c97c52	Generate man pages from asciidoc ... Working directly with g/roff is a pain. Also changed the formatting of toxic.conf.5 a bit. Signed-off-by: Loui Chang <louipc.ist@gmail.com>	2014-08-21 04:39:24 -04:00