5 Commits

Author	SHA1	Message	Date
apprb	8300f42e02	Reducing memory consumption: no reason to store all displayed ChatActions in memory	2014-10-25 01:25:28 +09:00
dubslow	41365ce057	Merge branch 'master' into history ... Conflicts: src/widget/form/genericchatform.h src/widget/widget.cpp	2014-10-17 03:56:59 -05:00
agilob	8788931f36	number of messages is more reliable then activities	2014-10-16 17:47:19 +02:00
apprb	fc9f8a16f3	Merge branch 'master' into history ... Conflicts: qtox.pro src/widget/form/chatform.cpp src/widget/form/settings/privacyform.cpp	2014-10-12 19:24:05 +09:00
dubslow	3ba95d82ae	Move code into src/	2014-10-07 23:26:25 -05:00