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

4 Commits

Author SHA1 Message Date
agilob
db5c115a91
removed duplicated emoticons 2014-10-13 19:50:54 +01:00
agilob
45c60a17c0 Merge remote-tracking branch 'upsteam/master' into emoticon-preview 2014-10-12 11:12:10 +01: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