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
krepa098
1d4055858f VideoSurface: aspect ratio 2014-10-17 09:09:59 +02: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