Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

El Legado De Pintia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

437bb79f

Commit 437bb79f authored 5 months ago by viccall

Downloads
- Plain Diff

Merge branch 'arrelgar-vistas' into 'develop'

Feature:

See merge request !43

parents 8fe6d9bf 11e93383

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.idea/deploymentTargetSelector.xml 10 additions, 0 deletions

.idea/deploymentTargetSelector.xml
app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt 7 additions, 4 deletions

...legadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt 0 additions, 1 deletion

...c/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
app/src/main/res/drawable/asi_reparar_palo.png 0 additions, 0 deletions

app/src/main/res/drawable/asi_reparar_palo.png
app/src/main/res/layout/activity_iniciominijuego1.xml 35 additions, 23 deletions

app/src/main/res/layout/activity_iniciominijuego1.xml
app/src/main/res/layout/activity_minijuego2.xml 5 additions, 6 deletions

app/src/main/res/layout/activity_minijuego2.xml
app/src/main/res/layout/activity_minijuego_reparacion.xml 14 additions, 20 deletions

app/src/main/res/layout/activity_minijuego_reparacion.xml
app/src/main/res/layout/activity_ruleta.xml 42 additions, 30 deletions

app/src/main/res/layout/activity_ruleta.xml

with 113 additions and 84 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