mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
1bacd2da7a
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 |
||
---|---|---|
.. | ||
cdata.cpp | ||
cdata.h | ||
cstring.cpp | ||
cstring.h | ||
settings.cpp | ||
settings.h | ||
smileypack.cpp | ||
smileypack.h | ||
style.cpp | ||
style.h |