Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

SoundingSoil_Android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

e4598827

Commit e4598827 authored 4 years ago by Sébastien Schiesser

Downloads
- Patches
- Plain Diff

Merge branch 'temp'

# Conflicts:
#	SoundingSoil/app/build.gradle
#	SoundingSoil/app/release/app-release.apk
#	SoundingSoil/app/release/output-metadata.json

parent 9e3a6760

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

SoundingSoil/app/build.gradle 9 additions, 19 deletions

SoundingSoil/app/build.gradle
SoundingSoil/app/release/app-release.apk 0 additions, 0 deletions

SoundingSoil/app/release/app-release.apk
SoundingSoil/app/release/output-metadata.json 2 additions, 2 deletions

SoundingSoil/app/release/output-metadata.json
SoundingSoil/app/src/main/res/drawable/connect_button_bkg.png 0 additions, 0 deletions

...dingSoil/app/src/main/res/drawable/connect_button_bkg.png
SoundingSoil/app/src/main/res/drawable/volume_low.png 0 additions, 0 deletions

SoundingSoil/app/src/main/res/drawable/volume_low.png
SoundingSoil/waveform/build.gradle 1 addition, 1 deletion

SoundingSoil/waveform/build.gradle

with 12 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment