apprb 6caa9f1e9f

Merge remote-tracking branch 'upstream/master' into history ...

Conflicts:
	qtox.pro
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/identityform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/messageaction.h
	src/widget/widget.cpp

2014-10-22 23:05:04 +09:00

..

avform.cpp

Remove redundancy from settings tabs

2014-10-17 16:27:28 +01:00

avform.h

NetVideoSource, YUV shader, fixes

2014-10-17 09:09:59 +02:00

avsettings.ui

a/v setting tab redesign

2014-10-20 14:54:27 +01:00

generalform.cpp

minimize to tray

2014-10-20 14:11:03 +01:00

generalform.h

minimize to tray

2014-10-20 14:11:03 +01:00

generalsettings.ui

minimize to tray

2014-10-20 14:11:03 +01:00

genericsettings.h

Merge branch 'master' into src

2014-10-10 17:21:54 -05:00

identityform.cpp

Merge remote-tracking branch 'upstream/master' into history

2014-10-22 23:05:04 +09:00

identityform.h

check for existing profile (fixes #466)

2014-10-19 22:36:39 -05:00

identitysettings.ui

added new profiles, default name/status (fixes #465 and fixes #460)

2014-10-19 22:07:51 -05:00

privacyform.cpp

Merge remote-tracking branch 'upstream/master' into history

2014-10-22 23:05:04 +09:00

privacyform.h

History: almost correct handling encrypted history load/save

2014-10-19 02:38:47 +09:00

privacysettings.ui

Tox datafile encryption: check

2014-10-19 23:59:58 +09:00