Merge branch 'master' of gitlab.utu.fi:teeehe/kayttoliittymat-2018 (fe9364b9) · Commits · Teemu Heinämäki / kayttoliittymat-2018 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kayttoliittymat-2018
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

Admin message

Maintenance moved to Monday 17.3. at 13:00. ETA 60 - 90 minutes.

fe9364b9

Commit fe9364b9 authored 6 years ago by Niko_Jousjärvi_1

Downloads
- Plain Diff

Merge branch 'master' of gitlab.utu.fi:teeehe/kayttoliittymat-2018

# Conflicts:
#	src/main/java/paikkavaraus/tripChoice/TicketChoice.java

parents 9ac530e8 04d64091

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/paikkavaraus/seatChoice/SeatChoice.java 4 additions, 0 deletions

src/main/java/paikkavaraus/seatChoice/SeatChoice.java
src/main/java/paikkavaraus/seatChoice/Vaunu1Controller.java 17 additions, 0 deletions

src/main/java/paikkavaraus/seatChoice/Vaunu1Controller.java
src/main/java/paikkavaraus/tripChoice/TicketChoice.java 19 additions, 0 deletions

src/main/java/paikkavaraus/tripChoice/TicketChoice.java
src/main/resources/Vaunu1.fxml 33 additions, 0 deletions

src/main/resources/Vaunu1.fxml
src/main/resources/seatChoice.fxml 30 additions, 40 deletions

src/main/resources/seatChoice.fxml

with 103 additions and 40 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