diff options
| author | alexichi <alexbankai96@gmail.com> | 2016-04-25 10:43:56 +0200 |
|---|---|---|
| committer | alexichi <alexbankai96@gmail.com> | 2016-04-25 10:43:56 +0200 |
| commit | 1ffba62faae83e18597270b68580a90ac3032a31 (patch) | |
| tree | 603d33ed48a9dd3690aeef379eeb7fd8ce3a257f /doc/Proposition initiale.out | |
| parent | 3ece645cc83e36aaa36c0258afa0f1b36eb13ca2 (diff) | |
| parent | dc28807625b9f53e621ec0d7063d99c2527cfa02 (diff) | |
| download | candybox-1ffba62faae83e18597270b68580a90ac3032a31.tar.gz candybox-1ffba62faae83e18597270b68580a90ac3032a31.tar.bz2 candybox-1ffba62faae83e18597270b68580a90ac3032a31.tar.xz candybox-1ffba62faae83e18597270b68580a90ac3032a31.zip | |
Merge remote-tracking branch 'origin/piernov' into alexichi
Conflicts:
craftmine.php
index.xhtml
Diffstat (limited to 'doc/Proposition initiale.out')
| -rw-r--r-- | doc/Proposition initiale.out | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Proposition initiale.out b/doc/Proposition initiale.out index b74885f..82b8e00 100644 --- a/doc/Proposition initiale.out +++ b/doc/Proposition initiale.out @@ -1,9 +1,9 @@ -\BOOKMARK [1][-]{section.1}{Fonctionalités}{}% 1 +\BOOKMARK [1][-]{section.1}{Fonctionnalités}{}% 1 \BOOKMARK [2][-]{subsection.1.1}{Mine}{section.1}% 2 \BOOKMARK [2][-]{subsection.1.2}{Guilde de mineurs}{section.1}% 3 \BOOKMARK [2][-]{subsection.1.3}{Magasin}{section.1}% 4 -\BOOKMARK [2][-]{subsection.1.4}{Doinjon}{section.1}% 5 -\BOOKMARK [2][-]{subsection.1.5}{bouton enregistrement/chargement de partie}{section.1}% 6 +\BOOKMARK [2][-]{subsection.1.4}{Donjon}{section.1}% 5 +\BOOKMARK [2][-]{subsection.1.5}{Enregistrement/chargement de partie}{section.1}% 6 \BOOKMARK [2][-]{subsection.1.6}{Interface utilisateur}{section.1}% 7 \BOOKMARK [1][-]{section.2}{Technologie}{}% 8 \BOOKMARK [1][-]{section.3}{Planification}{}% 9 |