Commit Graph

88 Commits

Author SHA1 Message Date
overtake
45c19fbc4c changes 2017-03-14 11:50:09 +03:00
Peter
2d14089ca5 Fix for rare stuck on bad tcp 2017-03-07 17:59:54 +03:00
Peter
8b64a69082 Merge commit '367d8a226234e1abd376832cdcf940e5837a14dc' 2017-02-23 00:08:27 +03:00
Peter
7433c00595 no message 2017-02-23 00:07:43 +03:00
Peter
367d8a2262 no message 2017-02-19 23:21:50 +03:00
Peter
976bdd6940 Merge branch 'tmp' 2017-02-07 22:27:05 +03:00
Peter
341309efd8 no message 2017-02-07 22:26:36 +03:00
Peter
746821b41a Merge branch 'master' into HEAD 2017-02-02 18:58:17 +03:00
Peter
dbba320020 no message 2017-02-02 18:58:11 +03:00
Peter
c6fdc9ab65 no message 2016-12-28 17:05:07 +03:00
Peter
a907fdd030 no message 2016-12-23 20:32:29 +03:00
Peter
e141530d22 Merge commit '36a7940bc0638ca2171b765a14bc8cc328a4f08a' 2016-12-23 18:11:48 +03:00
Peter
36a7940bc0 no message 2016-12-22 03:19:39 +03:00
Peter
51c51b1992 No message 2016-12-09 23:17:21 +03:00
Peter
8bd45739ed no message 2016-11-22 21:29:45 +03:00
Peter
387e8996dc Merge commit '2b964b14a767ea6095a6569d527c834ac4ba97ab' 2016-10-07 19:32:41 +03:00
Peter
b30577bbdc no message 2016-10-07 19:32:33 +03:00
Peter
2b964b14a7 no message 2016-09-29 02:04:35 +03:00
Peter
f8d06dc399 no message 2016-09-28 23:41:53 +03:00
Peter
c88865b71c Merge commit '952688d02c4603ce96e148e77dfe0946dfaa91db' 2016-09-26 15:29:50 +03:00
Peter
10d97e83ec no message 2016-09-26 15:29:44 +03:00
Peter
952688d02c no message 2016-09-06 01:32:43 +03:00
Peter
086ce402b0 Merge commit '24d097edbc174162662cc18ecffaa44b4d9bc46f'
# Conflicts:
#	MTProtoKit/MTSerialization.h
2016-09-05 23:46:22 +03:00
Peter
91b11ac6af no message 2016-09-05 23:19:51 +03:00
Peter
24d097edbc no message 2016-09-02 22:21:19 +03:00
Peter
243effea76 Merge commit '7b4d7027a6b55da29a82b8c76e9477c75f44617d' into mtproto-2.0 2016-09-02 21:57:11 +03:00
Peter
01f22552f6 no message 2016-09-02 21:56:36 +03:00
Peter
7b4d7027a6 Merge branch 'master' into HEAD
# Conflicts:
#	MtProtoKit.xcodeproj/project.pbxproj
2016-08-31 16:05:15 +03:00
Peter
d4aaf305e7 no message 2016-08-31 16:03:02 +03:00
Peter
e32d035f94 no message 2016-08-19 16:20:23 +03:00
Peter
98aaa3fc67 no message 2016-08-02 17:01:22 +03:00
Peter
f6334ce003 no message 2016-07-06 15:41:28 +03:00
Peter
198fe450ce no message 2016-05-25 16:02:39 +03:00
Peter
ecd4831a7f Merge commit 'edfe64f5a2663ed9a0e6234cbd79418ff7d521de' 2016-04-18 01:01:46 +03:00
Peter
6701328c56 no message 2016-04-18 01:01:38 +03:00
Peter
edfe64f5a2 Merge commit '2a5376d38ddb56d1bd888c364655d9739b4ee70b' 2016-04-01 14:31:00 +03:00
Peter
4eb8d0e771 no message 2016-04-01 14:30:48 +03:00
Peter
2a5376d38d Merge commit 'fea836c8f3df57572d251271bd1c4825637156fa'
Conflicts:
	MTProtoKit/MTProto.m
	MTProtoKit/MTTcpTransport.m
2016-03-28 17:18:29 +03:00
Peter
07ebdd0435 no message 2016-03-28 17:14:38 +03:00
Peter
fea836c8f3 no message 2016-03-09 01:07:49 +03:00
Peter
57a9c196b9 no message 2016-02-23 04:08:47 +03:00
Peter
a16591f636 no message 2016-02-08 16:31:27 +03:00
Peter
f8100ed3ef no message 2015-12-09 22:40:08 +03:00
Peter
21f9a87666 no message 2015-12-09 13:40:39 +03:00
Peter
00d413667a no message 2015-12-08 21:38:47 +03:00
Peter
12408852a5 no message 2015-09-17 19:19:38 +03:00
Peter
680e8bc30a no message 2015-08-12 16:17:51 +02:00
Peter
c089a42464 Better SESSION_REVOKED handling 2015-08-10 12:01:40 +02:00
Peter
fd51c954fb no message 2015-07-28 18:44:27 +03:00
Peter
6252ca75f7 Updated keychain 2015-07-27 15:01:26 +03:00