apprb
|
339afafa05
|
magic number removed in FileTransferInstance
|
2014-10-13 16:43:20 +09:00 |
|
apprb
|
57943e2435
|
FileTransferWidget improvements
|
2014-10-13 00:02:55 +09:00 |
|
dubslow
|
71e42cf6c8
|
add decryption
|
2014-10-12 05:24:57 -05:00 |
|
apprb
|
fc9f8a16f3
|
Merge branch 'master' into history
Conflicts:
qtox.pro
src/widget/form/chatform.cpp
src/widget/form/settings/privacyform.cpp
|
2014-10-12 19:24:05 +09:00 |
|
agilob
|
45c60a17c0
|
Merge remote-tracking branch 'upsteam/master' into emoticon-preview
|
2014-10-12 11:12:10 +01:00 |
|
agilob
|
5abf693611
|
Merge remote-tracking branch 'upsteam/master' into style
|
2014-10-12 11:08:10 +01: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
|
bf75750166
|
Merge branch 'master' into src
Conflicts:
qtox.pro
src/widget/form/settings/avform.h
src/widget/selfcamview.cpp
src/widget/selfcamview.h
src/widget/widget.cpp
widget/selfcamview.h
widget/videosurface.h
|
2014-10-10 17:21:54 -05:00 |
|
dubslow
|
3ba95d82ae
|
Move code into src/
|
2014-10-07 23:26:25 -05:00 |
|