17 Commits

Author	SHA1	Message	Date
apprb	277605ff17	cleanup	2014-10-22 23:14:42 +09:00
apprb	6caa9f1e9f	Merge remote-tracking branch 'upstream/master' into history ... Conflicts: qtox.pro src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/form/genericchatform.h src/widget/form/settings/identityform.cpp src/widget/tool/chatactions/messageaction.cpp src/widget/tool/chatactions/messageaction.h src/widget/widget.cpp	2014-10-22 23:05:04 +09:00
Tux3 / Mlkj / !Lev.uXFMLA	b6d581a462	Merge branch 'pr488'	2014-10-20 14:13:27 +02:00
dubslow	995e86aad9	ADD FORGOTTEN FILES WHY DO THESE THINGS HAPPEN (and fix outbound actions)	2014-10-20 06:53:17 -05:00
dubslow	a1ebf905b2	add global file auto accept	2014-10-19 23:25:52 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	9ba1d4cf41	Fix ChatForm::onAvMediaChange not checking callId/friendId ... May help with #458	2014-10-19 11:32:48 +02:00
dubslow	6e15bcb8d8	actually auto accept	2014-10-17 23:53:29 -05:00
Tux3 / Mlkj / !Lev.uXFMLA	26eb08aa00	Merge branch 'pr452'	2014-10-17 21:00:24 +02:00
dubslow	35f95ea501	fix #438	2014-10-17 07:36:10 -05:00
krepa098	bd07666275	fixes, cleanup	2014-10-17 09:11:39 +02:00
krepa098	2913326fb2	fix #416, cleanup	2014-10-17 09:09:59 +02:00
krepa098	f2b730cdb9	NetVideoSource, YUV shader, fixes	2014-10-17 09:09:59 +02:00
apprb	e3d5853ca3	no reason to keep action flag in the logfile	2014-10-14 23:36:32 +09:00
apprb	ec3d8146c6	correct action saving into the logfile	2014-10-14 22:43:03 +09:00
apprb	14a71a0f3f	precise timestamps keeping	2014-10-14 14:49:27 +09: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