Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

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

Snippets Groups Projects

cc86f282

Commit cc86f282 authored 3 years ago by Joachim Olerud Milward

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/dev' into dev

parents 18e266fd 05699c59

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

out/artifacts/idatg1002_2022_group6_jar/idatg1002_2022_group6.jar 0 additions, 0 deletions

...facts/idatg1002_2022_group6_jar/idatg1002_2022_group6.jar
src/main/java/META-INF/MANIFEST.MF 4 additions, 0 deletions

src/main/java/META-INF/MANIFEST.MF
src/main/java/no/ntnu/idatg1002/idatg1002_2022_group6/model/PlayerRegister.java 3 additions, 1 deletion

...idatg1002/idatg1002_2022_group6/model/PlayerRegister.java
src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/info-menu-view.fxml 2 additions, 2 deletions

.../ntnu/idatg1002/idatg1002_2022_group6/info-menu-view.fxml

with 9 additions and 3 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