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
..
chattextedit.cpp	Fix keypad enter not sending message	2015-01-31 22:54:52 +01:00
chattextedit.h	fixing problem with +1 lines in msg edit	2015-01-26 12:34:52 +00:00
friendrequestdialog.cpp	Fix #681	2015-01-24 19:58:16 +01:00
friendrequestdialog.h	Move code into src/	2014-10-07 23:26:25 -05:00