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
339afafa05
qTox/src/widget
History
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
..
form Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
tool Move code into src/ 2014-10-07 23:26:25 -05:00
adjustingscrollarea.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
adjustingscrollarea.h Move code into src/ 2014-10-07 23:26:25 -05:00
camera.cpp Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
camera.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
chatareawidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
chatareawidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
croppinglabel.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
croppinglabel.h Move code into src/ 2014-10-07 23:26:25 -05:00
emoticonswidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
emoticonswidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
friendlistwidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
friendlistwidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
friendwidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
friendwidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
genericchatroomwidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
genericchatroomwidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
groupwidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
groupwidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
maskablepixmapwidget.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
maskablepixmapwidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
netcamview.cpp Move code into src/ 2014-10-07 23:26:25 -05:00
netcamview.h Move code into src/ 2014-10-07 23:26:25 -05:00
videosurface.cpp Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
videosurface.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
widget.cpp Merge branch 'master' into src 2014-10-10 17:21:54 -05:00
widget.h Merge branch 'master' into src 2014-10-10 17:21:54 -05:00