1
0
mirror of https://github.com/NekoX-Dev/NekoX.git synced 2024-12-13 19:29:45 +01:00
NekoX/TMessagesProj/jni
世界 aa21a87a10
Merge upstream 7.7.0 (2284)
# Conflicts:
#	TMessagesProj/build.gradle
#	TMessagesProj/google-services.json
#	TMessagesProj/jni/TgNetWrapper.cpp
#	TMessagesProj/jni/tgnet/ConnectionsManager.h
#	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/ImageLocation.java
#	TMessagesProj/src/main/java/org/telegram/messenger/MediaController.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/messenger/SharedConfig.java
#	TMessagesProj/src/main/java/org/telegram/messenger/WearDataLayerListenerService.java
#	TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPBaseService.java
#	TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/ActionBarMenuItem.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/BaseFragment.java
#	TMessagesProj/src/main/java/org/telegram/ui/ActionBar/SimpleTextView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Adapters/DrawerLayoutAdapter.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/AccountSelectCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DialogMeUrlCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java
#	TMessagesProj/src/main/java/org/telegram/ui/Cells/UserCell2.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatEditActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/ChatUsersActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/ProfileGalleryView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/UndoView.java
#	TMessagesProj/src/main/java/org/telegram/ui/Components/voip/VoIPHelper.java
#	TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/GroupCallActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
#	TMessagesProj/src/main/java/org/telegram/ui/LoginActivity.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
2021-04-14 10:15:57 +08:00
..
boringssl@04b3213d43 Update dependencies 2021-03-09 21:20:23 +08:00
exoplayer Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
ffmpeg@89daac5fe2 Update to 7.6.0 (2264) 2021-03-19 13:25:58 +03:00
intro Update to 4.6.0 2017-12-08 20:35:59 +03:00
libwebp@47f64f6edd Update dependencies 2021-02-06 22:27:14 +08:00
lz4 Update to 5.9.0 2019-07-18 20:01:39 +07:00
mozjpeg Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
opus Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
patches Update dependencies 2021-02-06 22:27:14 +08:00
rlottie Update to 7.6.0 (2264) 2021-03-19 13:25:58 +03:00
sqlite Update to 7.3.0 (2196) 2020-12-24 09:36:01 +04:00
tgnet Merge upstream 7.7.0 (2284) 2021-04-14 10:15:57 +08:00
third_party Update to 7.3.0 (2195) 2020-12-23 11:48:30 +04:00
voip Merge upstream 7.7.0 (2284) 2021-04-14 10:15:57 +08:00
Application.mk Refind build scripts 2020-07-29 05:22:24 +00:00
audio.c Update to 6.0.0 (1908) 2020-03-30 15:00:09 +03:00
build_boringssl.sh [TF][JNI][UPDATE] BoringSSL from source (master) 2020-06-24 07:30:31 +00:00
build_ffmpeg_android.sh [TF][JNI][UPDATE] FFmpeg 4.2.3 from source 2020-06-24 07:30:30 +00:00
build_ffmpeg_clang.sh Migrate to CMake 2020-10-04 10:41:56 +00:00
c_utils.h Update to 5.4.0 2019-03-03 20:40:48 +00:00
CMakeLists.txt Merge upstream 7.7.0 (2284) 2021-04-14 10:15:57 +08:00
fast-edge.cpp Update to 4.9.0 2018-07-30 09:07:02 +07:00
fast-edge.h Update to 4.9.0 2018-07-30 09:07:02 +07:00
genann.c Update to 4.9.0 2018-07-30 09:07:02 +07:00
genann.h Update to 4.9.0 2018-07-30 09:07:02 +07:00
gifvideo.cpp Merge remote-tracking branch 'upstream/master' 2020-12-23 17:13:40 +08:00
image.cpp Migrate to CMake 2020-10-04 10:41:56 +00:00
jni.c Update to 7.0.0 (2061) 2020-08-15 03:01:55 +03:00
lottie.cpp Update to 7.2.0 (2128) 2020-10-30 13:26:29 +03:00
NativeLoader.cpp Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
patch_boringssl.sh Update libraries 2020-08-20 09:01:50 +00:00
patch_ffmpeg.sh Migrate to CMake 2020-10-04 10:41:56 +00:00
secureid_ocr.cpp Update to 4.9.0 2018-07-30 09:07:02 +07:00
SqliteWrapper.cpp Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
TgNetWrapper.cpp Merge upstream 7.7.0 (2284) 2021-04-14 10:15:57 +08:00
utilities.cpp Update to 7.1.0 (2090) 2020-09-30 16:48:47 +03:00
video.c Update to 4.9.0 2018-07-30 09:07:02 +07:00