4 Commits

Author	SHA1	Message	Date
agilob	6bda375a7e	fixes regression sent by apprb	2014-10-16 18:24:16 +01:00
agilob	5538167a46	fix for #442	2014-10-16 17:17:25 +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