世界 767c9897af Merge remote-tracking branch 'upstream/master' ... # Conflicts: # TMessagesProj/build.gradle # TMessagesProj/src/main/AndroidManifest.xml # TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java # TMessagesProj/src/main/java/org/telegram/messenger/BuildVars.java # TMessagesProj/src/main/java/org/telegram/messenger/FileLoader.java # TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java # TMessagesProj/src/main/java/org/telegram/messenger/MediaDataController.java # TMessagesProj/src/main/java/org/telegram/messenger/MessagesController.java # TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java # TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java # TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarPopupWindow.java # TMessagesProj/src/main/java/org/telegram/ui/ActionBar/Theme.java # TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsSearchAdapter.java # TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java # TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java # TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java # TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java # TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java # TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java # TMessagesProj/src/main/java/org/telegram/ui/Components/Bulletin.java # TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java # TMessagesProj/src/main/java/org/telegram/ui/Components/FragmentContextView.java # TMessagesProj/src/main/java/org/telegram/ui/GroupCreateFinalActivity.java # TMessagesProj/src/main/java/org/telegram/ui/LocationActivity.java # TMessagesProj/src/main/java/org/telegram/ui/PaymentFormActivity.java # TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java # TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java # build.gradle # gradle/wrapper/gradle-wrapper.properties		2020-10-30 14:57:47 +00:00
..
ApiScheme.cpp	Update to 6.3.0 (2040)	2020-07-26 11:03:38 +03:00
ApiScheme.h	Update to 6.3.0 (2040)	2020-07-26 11:03:38 +03:00
BuffersStorage.cpp
BuffersStorage.h
ByteArray.cpp
ByteArray.h
ByteStream.cpp
ByteStream.h
Config.cpp
Config.h
Connection.cpp
Connection.h
ConnectionSession.cpp
ConnectionSession.h
ConnectionsManager.cpp	Merge remote-tracking branch 'upstream/master'	2020-10-30 14:57:47 +00:00
ConnectionsManager.h	Merge remote-tracking branch 'upstream/master'	2020-10-30 14:57:47 +00:00
ConnectionSocket.cpp	Update to 6.3.0 (2040)	2020-07-26 11:03:38 +03:00
ConnectionSocket.h	Update to 5.13.1 (1827)	2020-01-05 14:50:11 +03:00
Datacenter.cpp	Merge remote-tracking branch 'upstream/master'	2020-10-01 09:01:48 +00:00
Datacenter.h	Bug fixes	2020-06-26 05:40:24 +00:00
Defines.h	Merge remote-tracking branch 'upstream/master'	2020-10-03 03:00:30 +00:00
EventObject.cpp
EventObject.h
FileLog.cpp
FileLog.h
Handshake.cpp	Native changes	2020-06-25 14:02:59 +00:00
Handshake.h	Native changes	2020-06-25 14:02:59 +00:00
MTProtoScheme.cpp
MTProtoScheme.h	Update to 6.1.0 (1938)	2020-04-24 12:21:58 +03:00
NativeByteBuffer.cpp
NativeByteBuffer.h
ProxyCheckInfo.cpp
ProxyCheckInfo.h
Request.cpp
Request.h	Bug fixes	2020-06-26 05:40:24 +00:00
Timer.cpp
Timer.h
TLObject.cpp
TLObject.h