1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
krepa098 52f220c9e4 Merge branch 'master' into chatlog_v3_1
Conflicts:
	qtox.pro
	res.qrc
	src/widget/form/chatform.cpp
	src/widget/form/chatform.h
	src/widget/form/genericchatform.cpp
	src/widget/tool/chatactions/chataction.h
	src/widget/tool/chatactions/messageaction.cpp
	src/widget/widget.cpp
	ui/chatArea/innerStyle.css
2015-02-02 14:31:44 +01:00
..
2014-11-17 21:06:04 +01:00
2014-10-01 16:45:10 +02:00
2014-09-05 23:03:26 +07:00
2014-11-17 21:06:04 +01:00
2014-11-15 21:30:20 +01:00