Merge remote-tracking branch 'origin/master'

This commit is contained in:
carlos
2017-06-21 23:52:24 +00:00
4 changed files with 5 additions and 13 deletions

View File

@@ -35,6 +35,7 @@ public class Main extends Application {
public static void main(String[] args) {
launch(args);
//launch(args);
System.out.println("Hola Mundo");
}
}

View File

@@ -1,8 +1,3 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<GridPane fx:controller="sample.Controller"
xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
</GridPane>