dubslow 6eeec77cce Merge branch 'master' into profiles ... Conflicts: misc/settings.cpp misc/settings.h widget/widget.cpp		2014-10-10 17:43:15 -05:00
..
settings	Merge branch 'master' into profiles	2014-10-10 17:43:15 -05:00
addfriendform.cpp	Typo	2014-09-12 23:55:37 +02:00
addfriendform.h	Clean code, improve compilation speed	2014-09-11 15:44:34 +02:00
chatform.cpp	removed broken custom window decoration	2014-10-04 11:03:50 +02:00
chatform.h	Fix #322	2014-09-26 21:26:31 +02:00
filesform.cpp	Clean code, improve compilation speed	2014-09-11 15:44:34 +02:00
filesform.h	Clean code, improve compilation speed	2014-09-11 15:44:34 +02:00
genericchatform.cpp	simplify groupchat names, fix #379, more simplification is possible	2014-10-06 01:46:30 -05:00
genericchatform.h	added sending actions, and tested both ways	2014-10-02 02:00:06 -05:00
groupchatform.cpp	simplify groupchat names, fix #379, more simplification is possible	2014-10-06 01:46:30 -05:00
groupchatform.h	simplify groupchat names, fix #379, more simplification is possible	2014-10-06 01:46:30 -05:00
settingswidget.cpp	progress	2014-10-08 14:25:32 +02:00
settingswidget.h	progress	2014-10-08 14:25:32 +02:00