Merge branch 'fx-test-branch' of...
Merge branch 'fx-test-branch' of gitlab.stud.idi.ntnu.no:andreksv/idatt-1002-2023-9 into fx-test-branch # Conflicts: # pom.xml # src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java # src/main/java/no/ntnu/idatt1002/demo/view/sceneController.java
No related branches found
No related tags found
Showing
- javadoc/no/ntnu/idatt1002/demo/MyApp.html 1 addition, 1 deletionjavadoc/no/ntnu/idatt1002/demo/MyApp.html
- javadoc/no/ntnu/idatt1002/demo/class-use/MyApp.html 3 additions, 3 deletionsjavadoc/no/ntnu/idatt1002/demo/class-use/MyApp.html
- pom.xml 3 additions, 4 deletionspom.xml
- src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java 6 additions, 10 deletionssrc/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
- src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.fxml 0 additions, 14 deletionssrc/main/java/no/ntnu/idatt1002/demo/view/NewBudget.fxml
- src/main/java/no/ntnu/idatt1002/demo/view/sceneController.java 6 additions, 7 deletions...ain/java/no/ntnu/idatt1002/demo/view/sceneController.java
- src/main/resources/CSS/outline.css 0 additions, 9 deletionssrc/main/resources/CSS/outline.css
- src/main/resources/Images/backgroundMini.jpg 0 additions, 0 deletionssrc/main/resources/Images/backgroundMini.jpg
- src/main/resources/Images/budgetbuddycover.jpeg 0 additions, 0 deletionssrc/main/resources/Images/budgetbuddycover.jpeg
- src/main/resources/Windows/FirstMenu.fxml 0 additions, 38 deletionssrc/main/resources/Windows/FirstMenu.fxml
- src/main/resources/view/FirstMenu.fxml 34 additions, 0 deletionssrc/main/resources/view/FirstMenu.fxml
- src/main/resources/view/NewBudget.fxml 24 additions, 0 deletionssrc/main/resources/view/NewBudget.fxml
Loading
Please register or sign in to comment