Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

Browse Source

# Conflicts:
#	Assets/Scripts/Scenes/MainController.cs

...

This commit is contained in:

Caiyanpeng committed 2021-09-28 11:30:08 +08:00

2 parents c73545d912 75900ccf3d

commit 5bd1c3b1ca

278 files changed

+19740 -112

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Plugins/Android/unityandroidbluetoothlelib.jar

BIN

Binary file not shown.