Raz492
|
1d2485d59e
|
Merge remote-tracking branch 'origin/master'
|
2021-06-20 21:24:34 +02:00 |
|
Raz492
|
eba661a070
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/de/edotzlaff/schockwelle/EarthquakeMapsActivity.java
# app/src/main/java/de/edotzlaff/schockwelle/SensorMapsActivity.java
# app/src/main/res/layout/activity_earthquake_maps.xml
|
2021-06-20 21:22:55 +02:00 |
|
Raz492
|
c37a99723f
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/de/edotzlaff/schockwelle/EarthquakeMapsActivity.java
# app/src/main/java/de/edotzlaff/schockwelle/SensorMapsActivity.java
# app/src/main/res/layout/activity_earthquake_maps.xml
|
2021-06-20 20:48:56 +02:00 |
|
Raz492
|
84ac745cec
|
Alpha Version der Schockwellen App
|
2021-06-20 20:42:35 +02:00 |
|
Raz492
|
344f6b4514
|
VerbesserungV2
|
2021-06-17 13:03:27 +02:00 |
|
Raz492
|
a6f02f3936
|
Aron hat hier die Vorlage von Edward übernommen. Er hat Code für die Kommunikation mit der Datenbank an den gewünschten Stellen eingefügt.
|
2021-06-16 22:47:00 +02:00 |
|