Commit graph

2 commits

Author SHA1 Message Date
John Preston
362b942a22 Merge branch 'same_peer_flag' into dev + fix style codegen rule desc.
Conflicts:
	Telegram/Telegram.vcxproj
	Telegram/Telegram.vcxproj.filters
2016-08-16 20:12:55 +03:00
John Preston
42ebe60f0b GYP/Ninja Windows build: complete, build scripts updated.
Telegram.sln deleted, in the future .sln will be in .gitignore.
2016-08-14 21:08:55 +03:00