Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Telegram/SourceFiles/intro/introwidget.h

@@ -74,7 +74,7 @@ public:
 
 	void finish(const MTPUser &user, const QImage &photo = QImage());
 
-	void rpcClear();
+	void rpcClear() override;
 	void langChangeTo(int32 langId);
 
 	void nextStep(IntroStep *step) {

Telegram/_openssl_patch.diff

@@ -1,13 +0,0 @@
-diff --git a/e_os.h b/e_os.h
-index 7584485..0b37c94 100644
---- a/e_os.h
-+++ b/e_os.h
-@@ -315,7 +315,7 @@ static __inline unsigned int _strlen31(const char *str)
- #    undef isxdigit
- #   endif
- #   if defined(_MSC_VER) && !defined(_DLL) && defined(stdin)
--#    if _MSC_VER>=1300
-+#    if (_MSC_VER>=1300) && (_MSC_VER<=1800)
- #     undef stdin
- #     undef stdout
- #     undef stderr

doc/building-msvc.md

@@ -21,7 +21,6 @@ Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu >
     git clone https://github.com/openssl/openssl.git
     cd openssl
     git checkout OpenSSL_1_0_1-stable
-    git apply ./../../tdesktop/Telegram/_openssl_patch.diff
     perl Configure VC-WIN32 --prefix=D:\TBuild\Libraries\openssl\Release
     ms\do_ms
     nmake -f ms\nt.mak
@@ -30,7 +29,6 @@ Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu >
     git clone https://github.com/openssl/openssl.git openssl_debug
     cd openssl_debug
     git checkout OpenSSL_1_0_1-stable
-    git apply ./../../tdesktop/Telegram/_openssl_patch.diff
     perl Configure debug-VC-WIN32 --prefix=D:\TBuild\Libraries\openssl_debug\Debug
     ms\do_ms
     nmake -f ms\nt.mak