Merge remote-tracking branch 'origin/master'

This commit is contained in:
Seil0
2017-04-17 01:00:32 +02:00
4 changed files with 17 additions and 11 deletions

View File

@ -71,8 +71,7 @@
mainWindowController = loader.getController(); //Link of FXMLController and controller class
mainWindowController.setMain(this); //call setMain
- //get os and the right paths
+ //get OS and the right paths
//get OS and the right paths
if(System.getProperty("os.name").equals("Linux")){
directory = new File(dirLinux);
configFile = new File(dirLinux + "/config.xml");