1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
qTox/widget/form/settings
dubslow 6eeec77cce Merge branch 'master' into profiles
Conflicts:
	misc/settings.cpp
	misc/settings.h
	widget/widget.cpp
2014-10-10 17:43:15 -05:00
..
avform.cpp renamed SelfCamView to VideoSurface 2014-10-08 16:44:32 +02:00
avform.h renamed SelfCamView to VideoSurface 2014-10-08 16:44:32 +02:00
avsettings.ui cleanup, split 2014-10-08 16:37:42 +02:00
generalform.cpp support for hiding in tray 2014-10-08 15:17:05 +01:00
generalform.h support for hiding in tray 2014-10-08 15:17:05 +01:00
generalsettings.ui support for hiding in tray 2014-10-08 15:17:05 +01:00
genericsettings.h progress 2014-10-08 14:25:32 +02:00
identityform.cpp Merge branch 'master' into profiles 2014-10-10 17:43:15 -05:00
identityform.h Merge branch 'master' into profiles 2014-10-10 17:43:15 -05:00
identitysettings.ui (Re)implement profiles UI, using some of the old code. 2014-10-09 03:07:26 -05:00
privacyform.cpp base refactoring 2014-10-06 01:17:01 +09:00
privacyform.h new settings infrastructure done, though there's a double free or something in ~Widget() 2014-09-15 05:45:59 -05:00