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
..
chatArea.css	No border for message area (as in mockup)	2014-11-25 19:10:00 +02:00
chatHead.css	removing border from contact name linedit	2014-12-15 17:14:17 +01:00
info.png	progress	2014-11-16 12:40:44 +01:00
innerStyle.css	Merge branch 'master' into chatlog_v3_1	2015-01-03 10:17:53 +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.png	progress	2014-11-12 16:45:24 +01:00
symbols.svg	artwork	2014-11-16 13:01:26 +01:00