Merge remote-tracking branch 'origin/master'
# Conflicts: # Wanderer.csproj
Showing
- README.md 26 additions, 32 deletionsREADME.md
- Wanderer.csproj 15 additions, 0 deletionsWanderer.csproj
- ressources/34258_large.jpg 0 additions, 0 deletionsressources/34258_large.jpg
- ressources/alpes-aventure-randonnee-trek-famille-refuge-bans-home.jpeg 0 additions, 0 deletions...pes-aventure-randonnee-trek-famille-refuge-bans-home.jpeg
- ressources/group.png 0 additions, 0 deletionsressources/group.png
- ressources/mountaineer.png 0 additions, 0 deletionsressources/mountaineer.png
- ressources/path-forest-trees-bushes-grass-cc.jpg 0 additions, 0 deletionsressources/path-forest-trees-bushes-grass-cc.jpg
- ressources/path-forest-trees-bushes-grass-min.jpg 0 additions, 0 deletionsressources/path-forest-trees-bushes-grass-min.jpg
- view/FormAide.Designer.cs 88 additions, 1 deletionview/FormAide.Designer.cs
- view/FormFin.Designer.cs 63 additions, 0 deletionsview/FormFin.Designer.cs
- view/FormFin.Designer.cs.bak 63 additions, 0 deletionsview/FormFin.Designer.cs.bak
- view/FormFin.cs 25 additions, 0 deletionsview/FormFin.cs
- view/FormFin.resx 17491 additions, 0 deletionsview/FormFin.resx
- view/FormJeu.Designer.cs 50 additions, 19 deletionsview/FormJeu.Designer.cs
- view/FormJeu.cs 0 additions, 1 deletionview/FormJeu.cs
- view/FormJeu.resx 232 additions, 168 deletionsview/FormJeu.resx
- view/FormMainMenu.Designer.cs 10 additions, 6 deletionsview/FormMainMenu.Designer.cs
- view/FormMainMenu.cs 5 additions, 0 deletionsview/FormMainMenu.cs
- view/FormMainMenu.resx 138693 additions, 0 deletionsview/FormMainMenu.resx
Please register or sign in to comment