kleineckeol72024 b97c494427 Merge branch 'master' into prepareMaster ...

# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/Detection/DetectionReport.java
#	app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
#	app/src/main/java/com/example/ueberwachungssystem/Detection/MicrophoneDetector.java
#	app/src/main/java/com/example/ueberwachungssystem/Detection/VideoDetector.java
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
#	app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java
#	app/src/main/res/layout/activity_main.xml

2023-06-21 18:43:55 +02:00

..

src

Merge branch 'master' into prepareMaster

2023-06-21 18:43:55 +02:00

.gitignore

added new Project ueberwachungssystem

2023-05-11 15:25:28 +02:00

build.gradle

Merge remote-tracking branch 'origin/master' into Kommunikationcopie

2023-06-20 21:13:26 +02:00

proguard-rules.pro

added new Project ueberwachungssystem

2023-05-11 15:25:28 +02:00