StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
fc9f8a16f3
qTox/src/widget/form/settings
History
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
..
avform.cpp Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
avform.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
avsettings.ui Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
generalform.cpp Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
generalform.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
generalsettings.ui Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
genericsettings.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
identityform.cpp Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
identityform.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
identitysettings.ui Move code into src/ 2014-10-07 23:26:25 -05:00
privacyform.cpp Merge branch 'master' into history 2014-10-12 19:24:05 +09:00
privacyform.h Merge branch 'master' into history 2014-10-12 19:24:05 +09:00
privacysettings.ui Merge branch 'master' into history 2014-10-12 19:24:05 +09:00