Merge branch 'master' of https://git.unistra.fr/SPA18-T4-C/diabete_simulator
Correction d'un bug ajout des icones et correction des méchants conflits
Showing
- assets/images/Conseils params/Age.png 0 additions, 0 deletionsassets/images/Conseils params/Age.png
- assets/images/Conseils params/Masse.png 0 additions, 0 deletionsassets/images/Conseils params/Masse.png
- assets/images/Conseils params/sex.png 0 additions, 0 deletionsassets/images/Conseils params/sex.png
- assets/images/Conseils params/taille.png 0 additions, 0 deletionsassets/images/Conseils params/taille.png
- source/diabete_simulator_2018/FormAccueil.Designer.cs 68 additions, 1 deletionsource/diabete_simulator_2018/FormAccueil.Designer.cs
- source/diabete_simulator_2018/FormAccueil.cs 77 additions, 3 deletionssource/diabete_simulator_2018/FormAccueil.cs
- source/diabete_simulator_2018/FormCharts.Designer.cs 1 addition, 0 deletionssource/diabete_simulator_2018/FormCharts.Designer.cs
- source/diabete_simulator_2018/FormCharts.cs 1 addition, 1 deletionsource/diabete_simulator_2018/FormCharts.cs
- source/diabete_simulator_2018/FormGameOver.Designer.cs 1 addition, 0 deletionssource/diabete_simulator_2018/FormGameOver.Designer.cs
- source/diabete_simulator_2018/FormMainPanel.Designer.cs 2 additions, 1 deletionsource/diabete_simulator_2018/FormMainPanel.Designer.cs
- source/diabete_simulator_2018/FormMainPanel.cs 5 additions, 0 deletionssource/diabete_simulator_2018/FormMainPanel.cs
- source/diabete_simulator_2018/Properties/Resources.Designer.cs 50 additions, 2 deletions...e/diabete_simulator_2018/Properties/Resources.Designer.cs
- source/diabete_simulator_2018/Properties/Resources.resx 21 additions, 6 deletionssource/diabete_simulator_2018/Properties/Resources.resx
- source/diabete_simulator_2018/Resources/Age.png 0 additions, 0 deletionssource/diabete_simulator_2018/Resources/Age.png
- source/diabete_simulator_2018/Resources/Masse.png 0 additions, 0 deletionssource/diabete_simulator_2018/Resources/Masse.png
- source/diabete_simulator_2018/Resources/sex.png 0 additions, 0 deletionssource/diabete_simulator_2018/Resources/sex.png
- source/diabete_simulator_2018/Resources/taille.png 0 additions, 0 deletionssource/diabete_simulator_2018/Resources/taille.png
- source/diabete_simulator_2018/diabete_simulator_2018.csproj 15 additions, 0 deletionssource/diabete_simulator_2018/diabete_simulator_2018.csproj
Please register or sign in to comment