krepa098 5506379a97 Merge branch 'master' into chatlog_v3_1		2015-02-07 18:49:06 +01:00
..
advancedform.cpp	Move "Make Tox portable" to advanced settings tab	2015-01-22 09:55:24 -06:00
advancedform.h	Move "Make Tox portable" to advanced settings tab	2015-01-22 09:55:24 -06:00
advancedsettings.ui	chat logs -> chat history, miscellaneous rewordings	2015-02-03 13:56:08 -06:00
avform.cpp	Initial android support	2015-02-06 01:27:07 +01:00
avform.h	Add support for playback audio slider setting	2015-02-01 16:58:59 +01:00
avsettings.ui	Add support for playback audio slider setting	2015-02-01 16:58:59 +01:00
generalform.cpp	Merge branch 'master' into chatlog_v3_1	2015-02-07 18:49:06 +01:00
generalform.h	Move "Make Tox portable" to advanced settings tab	2015-01-22 09:55:24 -06:00
generalsettings.ui	Some tweaks for tooltips in settings	2015-02-01 10:56:28 +00:00
genericsettings.h	Merge branch 'master' into src	2014-10-10 17:21:54 -05:00
identityform.cpp	Cleanup 331baa7447	2015-02-06 14:03:34 -06:00
identityform.h	Merge branch 'encryption' into master	2015-01-23 01:51:39 -06:00
identitysettings.ui	Add tooltips in settings	2015-01-31 09:53:12 +00:00
privacyform.cpp	Cleanup 331baa7447	2015-02-06 14:03:34 -06:00
privacyform.h	Ah, much cleaner	2014-12-03 18:14:28 -06:00
privacysettings.ui	chat logs -> chat history, miscellaneous rewordings	2015-02-03 13:56:08 -06:00