4 Commits

Author	SHA1	Message	Date
apprb	eaa315eddb	various fixes	2014-10-19 17:48:10 +09:00
apprb	1a37c1c421	History: almost correct handling encrypted history load/save ... Things are left to do: 1. load/save encrypted tox datafile 2. incorrect passwords processing (ask to retype, wipe everything, etc.) 3. reencryp history log with new password	2014-10-19 02:38:47 +09:00
apprb	fc9f8a16f3	Merge branch 'master' into history ... Conflicts: qtox.pro src/widget/form/chatform.cpp src/widget/form/settings/privacyform.cpp	2014-10-12 19:24:05 +09:00
dubslow	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00