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

2 Commits

Author SHA1 Message Date
dubslow
235d6609b9 Merge branch 'master' into profiles
Conflicts:
	src/widget/form/settings/identityform.cpp
2014-10-12 04:58:56 -05:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00