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
a0ea0675a7
qTox/src/widget
History
krepa098 a0ea0675a7 Merge branch 'master' into chatlog_v3_1 
Conflicts:
	qtox.pro
	res.qrc
	src/misc/smileypack.cpp
	src/widget/chatareawidget.cpp
	src/widget/chatareawidget.h
	src/widget/form/chatform.cpp
	src/widget/form/genericchatform.cpp
	src/widget/form/genericchatform.h
	src/widget/form/settings/generalform.cpp
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/tool/chatactions/systemmessageaction.cpp
	src/widget/widget.cpp
2015-01-03 10:17:53 +01:00
..
form Merge branch 'master' into chatlog_v3_1 2015-01-03 10:17:53 +01:00
tool Revert "fix #902" 2014-12-13 12:18:43 -06: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
croppinglabel.cpp fix bug (which is actually why aliasing was menu'd in the first place) 2014-11-17 21:22:40 -06:00
croppinglabel.h Fix #767 2014-11-15 23:17:30 +01:00
emoticonswidget.cpp bye bye base64 emoticons 2014-11-16 12:52:53 +01:00
emoticonswidget.h Fix #670 2014-11-08 14:07:51 +01: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 Group class refactoring 2014-11-24 00:58:53 +09:00
friendwidget.h set aliases from chat form (half of #780) 2014-11-17 20:15:44 -06:00
genericchatroomwidget.cpp Fix #767 2014-11-15 23:17:30 +01:00
genericchatroomwidget.h Add GUI to change theme color 2014-11-15 21:30:20 +01:00
groupwidget.cpp GroupWidget: menu reordering 2014-11-24 00:58:53 +09:00
groupwidget.h group title support 2014-11-14 18:23:54 +01:00
maskablepixmapwidget.cpp Style corrections 2014-12-11 18:05:52 +00:00
maskablepixmapwidget.h Move code into src/ 2014-10-07 23:26:25 -05:00
netcamview.cpp more strings for translation 2014-10-29 22:08:02 +03:00
netcamview.h Fix conflicting declarations struct/class vpx_image 2014-11-13 22:40:10 +01:00
toxsave.cpp Same mistake every time... 2014-11-07 16:06:37 -06:00
toxsave.h remove incorrect line 2014-11-07 16:17:23 -06:00
toxuri.cpp Sort res.qrc and remove some unnecessary spaces 2014-11-29 11:27:36 +00:00
toxuri.h handle tox save files, also fix IdentForm bug 2014-11-07 15:45:21 -06:00
videosurface.cpp format shader code 2014-10-26 17:08:35 +01:00
videosurface.h moved video stuff to src/video 2014-10-24 16:02:55 +02:00
widget.cpp Merge branch 'master' into chatlog_v3_1 2015-01-03 10:17:53 +01:00
widget.h Merge branch 'pr862' 2014-12-01 15:37:09 -06:00