Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
tp-4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirkl-poo-2018
tp-4
Commits
da5bcc40
Verified
Commit
da5bcc40
authored
6 years ago
by
Théo Pirkl
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/devel' into devel
parents
3f680d52
d76302b1
Branches
Branches containing commit
No related tags found
1 merge request
!21
*poof* final version
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/ch/hepia/ui/MainWindowController.java
+19
-1
19 additions, 1 deletion
src/main/java/ch/hepia/ui/MainWindowController.java
src/main/resources/fxml/MainWindow.fxml
+1
-1
1 addition, 1 deletion
src/main/resources/fxml/MainWindow.fxml
with
20 additions
and
2 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
