1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

6 Commits

Author SHA1 Message Date
dubslow
1bacd2da7a Merge branch 'master' into profiles... yikes
Conflicts:
	core.cpp
	core.h
	misc/settings.cpp
	misc/settings.h
	widget/form/settings/generalform.h
	widget/form/settingsform.cpp
	widget/widget.cpp
	widget/widget.h
2014-10-08 20:25:26 -05:00
apprb
443ee0a4f8 Proxy settings is more close to General group in settings.ini than to Privacy 2014-10-07 09:25:00 +07:00
apprb
ddf7a7edfd added "Use Proxy" checkbox 2014-10-07 09:24:29 +07:00
dubslow
d093679d03 Add proxy support 2014-10-06 10:04:17 -05:00
krepa098
23a64ef45f removed broken custom window decoration 2014-10-04 11:03:50 +02:00
dubslow
8a1c912da3 mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00