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-08-27 10:13:17 +08:00

2 parents 428a7c5507 d8927ceca5

commit 85130ce6c3

16 files changed

+135 -69

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.