Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

cd6d5d22

Commit cd6d5d22 authored 4 months ago by victorm

Downloads
- Plain Diff

Merge branch 'entrega2' of...

Merge branch 'entrega2' of https://gitlab.inf.uva.es/javcalv/entrega_javcalv_victorm.git into entrega2

parents 5b3ae4fa 90f13962

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/es/markse/Combinado.java 34 additions, 58 deletions

src/es/markse/Combinado.java
src/es/markse/PackCamionBarco.java 8 additions, 7 deletions

src/es/markse/PackCamionBarco.java
src/es/markse/PackCamionTren.java 8 additions, 7 deletions

src/es/markse/PackCamionTren.java
src/es/markse/Simple.java 61 additions, 0 deletions

src/es/markse/Simple.java
src/es/markse/TBarco.java 1 addition, 1 deletion

src/es/markse/TBarco.java
src/es/markse/TVehiculoTierra.java 1 addition, 1 deletion

src/es/markse/TVehiculoTierra.java
src/es/markse/Trayecto.java 22 additions, 8 deletions

src/es/markse/Trayecto.java
uses/es/markse/PackCamionBarcoTest.java 41 additions, 0 deletions

uses/es/markse/PackCamionBarcoTest.java

with 176 additions and 82 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