kohlerba68671 0ee1446cbc Merge branch 'bk_video_service' into bk_video ...

# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

2023-06-19 14:40:06 +02:00

..

src

Merge branch 'bk_video_service' into bk_video

2023-06-19 14:40:06 +02:00

.gitignore

Initial commit Project Version 0

2023-05-11 15:08:50 +02:00

build.gradle

Added DetectionService

2023-06-19 13:13:23 +02:00

proguard-rules.pro

Initial commit Project Version 0

2023-05-11 15:08:50 +02:00