Commit d343844b authored by Tristan MAISONNEUVE's avatar Tristan MAISONNEUVE
Browse files

Merge remote-tracking branch 'origin/master'

parents 379abe8d c7841885
......@@ -284,6 +284,7 @@ public class FenetreConnexion extends JFrame {
// public Integer getGameID(){ return gameId; }
public NavyFleet getFlotte(){ return flotte;}
public Boolean getCreerpartie() { return true; }
public Game getgamefromlist(){ return (Game) pInitialise.getSelectedItem();}
// Les setters
// public void setGameID(Integer i){ gameId = i; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment