1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
qTox/src/misc
dubslow 41365ce057 Merge branch 'master' into history
Conflicts:
	src/widget/form/genericchatform.h
	src/widget/widget.cpp
2014-10-17 03:56:59 -05:00
..
db Encryption: it works! Code cleanup is still required 2014-10-17 00:38:15 +09:00
cdata.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
cdata.h Move code into src/ 2014-10-07 23:26:25 -05:00
cstring.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
cstring.h Move code into src/ 2014-10-07 23:26:25 -05:00
settings.cpp Merge branch 'master' into history 2014-10-17 03:56:59 -05:00
settings.h cleanup "sign in change", since it's unnecessary 2014-10-16 17:52:45 +02:00
smileypack.cpp Merge remote-tracking branch 'upsteam/master' into emoticon-preview 2014-10-12 11:12:10 +01:00
smileypack.h Move code into src/ 2014-10-07 23:26:25 -05:00
style.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
style.h Move code into src/ 2014-10-07 23:26:25 -05:00