Merge remote-tracking branch 'origin/victorsam/demo' into victorsam/demo

Browse Source

# Conflicts:
#	demo/src/main/kotlin/ru/mipt/npm/controls/demo/virtual_car/VirtualCar.kt
#	demo/src/main/kotlin/ru/mipt/npm/controls/demo/virtual_car/VirtualCarController.kt

...

This commit is contained in:

Atos1337 2021-10-28 11:17:45 +03:00

parent 357fcec4fe 418a97f99a

commit c1a1b6e696

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

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

Diff Content Not Available