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
1,902 Commits 3 Branches 42 Tags 60 MiB
ed22dc9ca5
Commit Graph

55 Commits

Author SHA1 Message Date
dubslow
33e0c95ab6 Merge branch 'master' into corencryption 
Conflicts:
	src/core.cpp
 2014-10-13 16:07:03 -05:00
dubslow
71e42cf6c8 add decryption 2014-10-12 05:24:57 -05:00
dubslow
235d6609b9 Merge branch 'master' into profiles 
Conflicts:
	src/widget/form/settings/identityform.cpp
 2014-10-12 04:58:56 -05:00
dubslow
63bb51a089 Merge branch 'master' into corencryption 2014-10-12 04:55:02 -05:00
dubslow
3ba95d82ae Move code into src/ 2014-10-07 23:26:25 -05:00