Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

67150b75

Commit 67150b75 authored 3 years ago by Karin Pettersen

Downloads
- Plain Diff

Merge branch 'master' of git.gvk.idi.ntnu.no:mesji/bacheloroppgave_2022 into Karins_branch

parents 685c6ddd 2ca7d202

No related branches found

No related tags found

No related merge requests found

Changes 51

Hide whitespace changes

Inline Side-by-side

Showing

src/main/resources/com.application/GUI/graphical_user_interface.fxml 96 additions, 0 deletions

...sources/com.application/GUI/graphical_user_interface.fxml
src/main/resources/com.application/GUI/moelven_logo_m.jpg 0 additions, 0 deletions

src/main/resources/com.application/GUI/moelven_logo_m.jpg
src/main/resources/com.application/GUI/moelven_logo_tittle.jpg 0 additions, 0 deletions

...ain/resources/com.application/GUI/moelven_logo_tittle.jpg
src/main/resources/com.application/test.fxml 0 additions, 128 deletions

src/main/resources/com.application/test.fxml
target/classes/META-INF/Bachelor_application.kotlin_module 0 additions, 0 deletions

target/classes/META-INF/Bachelor_application.kotlin_module
target/classes/com.application/GUI/graphical_user_interface.fxml 96 additions, 0 deletions

...classes/com.application/GUI/graphical_user_interface.fxml
target/classes/com.application/GUI/moelven_logo_m.jpg 0 additions, 0 deletions

target/classes/com.application/GUI/moelven_logo_m.jpg
target/classes/com.application/GUI/moelven_logo_tittle.jpg 0 additions, 0 deletions

target/classes/com.application/GUI/moelven_logo_tittle.jpg
target/classes/com.application/test.fxml 0 additions, 128 deletions

target/classes/com.application/test.fxml
target/classes/com/application/DataBase/DB.class 0 additions, 0 deletions

target/classes/com/application/DataBase/DB.class
target/classes/com/application/Main.class 0 additions, 0 deletions

target/classes/com/application/Main.class

with 192 additions and 256 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