dubslow 6649ae568e Merge branch 'master' into newsettings ... Conflicts: core.h qtox.pro widget/form/genericchatform.cpp widget/settingsdialog.cpp widget/tool/chataction.cpp widget/widget.cpp widget/widget.h		2014-09-30 04:57:05 -05:00
..
settings	Added all current settings except cam test, which segfaults on init...	2014-09-30 04:44:27 -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	FileTransferInstance responce on broken filetransfer state	2014-09-30 00:22:19 +07: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	fix file mvs	2014-09-29 13:28:59 -05:00
genericchatform.h	Wrap name and date fix	2014-09-28 23:39:26 +07:00
groupchatform.cpp	Added MaskablePixmapWidget, improved avatar rendering	2014-09-26 19:13:08 +02:00
groupchatform.h	drag&drop support	2014-09-25 18:05:07 +02:00
settingswidget.cpp	Added all current settings except cam test, which segfaults on init...	2014-09-30 04:44:27 -05:00
settingswidget.h	Added all current settings except cam test, which segfaults on init...	2014-09-30 04:44:27 -05:00