Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

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

Snippets Groups Projects

49a34192

Commit 49a34192 authored 10 months ago by Håvard Daleng

Downloads
- Patches
- Plain Diff

Fixed conflicts.

parent fa92518b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/edu/ntnu/stud/chaosgame/controller/game/GuiButtonController.java 2 additions, 2 deletions

...u/stud/chaosgame/controller/game/GuiButtonController.java
src/main/java/edu/ntnu/stud/chaosgame/controller/utility/ChaosGameFileHandler.java 2 additions, 2 deletions

...ud/chaosgame/controller/utility/ChaosGameFileHandler.java
src/main/java/edu/ntnu/stud/chaosgame/controller/utility/Formatter.java 1 addition, 1 deletion

...edu/ntnu/stud/chaosgame/controller/utility/Formatter.java
src/main/java/edu/ntnu/stud/chaosgame/controller/utility/PopupManager.java 1 addition, 1 deletion

.../ntnu/stud/chaosgame/controller/utility/PopupManager.java
src/main/java/edu/ntnu/stud/chaosgame/view/ChaosGameImageView.java 7 additions, 38 deletions

...java/edu/ntnu/stud/chaosgame/view/ChaosGameImageView.java

with 13 additions and 44 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