tux3 e79d40e356 Merge branch 'pr1446' ... Conflicts: src/chatlog/chatlog.cpp src/chatlog/content/filetransferwidget.cpp src/core.cpp src/core/coreencryption.cpp src/toxdns.cpp src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/friendwidget.cpp src/widget/widget.cpp		2015-05-07 22:00:50 +02:00
..
content	Merge branch 'pr1446'	2015-05-07 22:00:50 +02:00
chatline.cpp	Merge branch 'pr1446'	2015-05-07 22:00:50 +02:00
chatline.h	correct after CppCheck	2015-04-13 00:49:24 +03:00
chatlinecontent.cpp	change color for precise selection on focus-in/out	2015-02-03 10:33:46 +01:00
chatlinecontent.h	change color for precise selection on focus-in/out	2015-02-03 10:33:46 +01:00
chatlinecontentproxy.cpp	Align file bubbles better	2015-03-14 18:57:07 +01:00
chatlinecontentproxy.h	cleanup	2015-02-04 15:36:45 +01:00
chatlog.cpp	Merge branch 'pr1446'	2015-05-07 22:00:50 +02:00
chatlog.h	#1402 duplicate of the sender's name	2015-03-26 00:31:39 +03:00
chatmessage.cpp	Merge branch 'pr1446'	2015-05-07 22:00:50 +02:00
chatmessage.h	Refactor Core	2015-04-24 02:32:09 +02:00
customtextdocument.cpp	fix issue #1161 round 2!	2015-02-16 15:28:57 +01:00
customtextdocument.h	(c)	2014-11-16 12:58:43 +01:00
documentcache.cpp	Some style fixes	2015-03-20 18:38:10 +00:00
documentcache.h	fix crash on exit	2015-02-04 09:52:55 +01:00
pixmapcache.cpp	Some style fixes	2015-03-20 18:38:10 +00:00
pixmapcache.h	fix crash on exit	2015-02-04 09:52:55 +01:00