1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
qTox/misc
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
..
cdata.cpp mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00
cdata.h mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00
cstring.cpp mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00
cstring.h Add proxy support 2014-10-06 10:04:17 -05:00
settings.cpp Merge branch 'master' into profiles... yikes 2014-10-08 20:25:26 -05:00
settings.h Merge branch 'master' into profiles... yikes 2014-10-08 20:25:26 -05:00
smileypack.cpp mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00
smileypack.h mv some files, clean up top level folder 2014-09-28 23:16:11 -05:00
style.cpp relative to system wide default font sizes in css 2014-10-06 23:39:07 +09:00
style.h relative to system wide default font sizes in css 2014-10-06 23:39:07 +09:00