Waetschker Daniel (uib17511) e9c6f25a66 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/de/hems/trafficsim/MainActivity.java # app/src/main/java/de/hems/trafficsim/Track.java # app/src/main/java/de/hems/trafficsim/Vehicle.java # app/src/main/java/de/hems/trafficsim/Worker.java		2020-11-02 17:20:59 +01:00
.idea	Add MainActivity	2020-09-16 11:48:20 +02:00
app	implement average method	2020-11-02 17:19:07 +01:00
doc	Create classes Track, Vehicle and VehicleTimeRecord. Adjust class diagram.	2020-09-16 14:20:51 +02:00
gradle/wrapper	Create Android Studio project	2020-09-07 14:34:45 +02:00
.gitignore	Create Android Studio project	2020-09-07 14:34:45 +02:00
build.gradle	Create Android Studio project	2020-09-07 14:34:45 +02:00
gradle.properties	Create Android Studio project	2020-09-07 14:34:45 +02:00
gradlew	Create Android Studio project	2020-09-07 14:34:45 +02:00
gradlew.bat	Create Android Studio project	2020-09-07 14:34:45 +02:00
settings.gradle	Create Android Studio project	2020-09-07 14:34:45 +02:00