Skip to content
Snippets Groups Projects
Commit 3e1ad091 authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Merge branch 'master' into 'minh-help'

# Conflicts:
#   src/main/java/ui/window/JDialogCPUNode.java
parents e40eb6d1 3a7875af
No related branches found
No related tags found
1 merge request!148Setting help window location relative to help button
Showing
with 857 additions and 495 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 to comment