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
..
chatArea.css	styled chatlog, cleanup	2015-01-03 10:21:15 +01:00
chatHead.css	removing border from contact name linedit	2014-12-15 17:14:17 +01:00
error.svg	[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent	2015-01-26 14:01:42 +01:00
info.svg	[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent	2015-01-26 14:01:42 +01:00
innerStyle.css	Merge branch 'master' into chatlog_v3_1	2015-02-02 14:31:44 +01:00
scrollBarDownArrow.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
scrollBarDownArrowHover.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
scrollBarDownArrowPressed.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
scrollBarHandle.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
scrollBarUpArrow.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
scrollBarUpArrowHover.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
scrollBarUpArrowPressed.png	Revert "Revert "Skinned scrollbars and other small improvements""	2014-06-28 23:59:11 +02:00
spinner.svg	[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent	2015-01-26 14:01:42 +01:00
symbols.svg	[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent	2015-01-26 14:01:42 +01:00
typing.svg	[HiDPI] ChatLog: replaced all .png by .svg, FTW custom paintEvent	2015-01-26 14:01:42 +01:00