aboutsummaryrefslogtreecommitdiffstats
path: root/doc/Proposition initiale.aux
diff options
context:
space:
mode:
authoralexichi <alexbankai96@gmail.com>2016-04-25 10:43:56 +0200
committeralexichi <alexbankai96@gmail.com>2016-04-25 10:43:56 +0200
commit1ffba62faae83e18597270b68580a90ac3032a31 (patch)
tree603d33ed48a9dd3690aeef379eeb7fd8ce3a257f /doc/Proposition initiale.aux
parent3ece645cc83e36aaa36c0258afa0f1b36eb13ca2 (diff)
parentdc28807625b9f53e621ec0d7063d99c2527cfa02 (diff)
downloadcandybox-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.aux')
-rw-r--r--doc/Proposition initiale.aux6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Proposition initiale.aux b/doc/Proposition initiale.aux
index e4422b3..b790743 100644
--- a/doc/Proposition initiale.aux
+++ b/doc/Proposition initiale.aux
@@ -21,12 +21,12 @@
\@writefile{toc}{\select@language {french}}
\@writefile{lof}{\select@language {french}}
\@writefile{lot}{\select@language {french}}
-\@writefile{toc}{\contentsline {section}{\numberline {1}Fonctionalités}{1}{section.1}}
+\@writefile{toc}{\contentsline {section}{\numberline {1}Fonctionnalités}{1}{section.1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Mine}{1}{subsection.1.1}}
\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}Guilde de mineurs}{1}{subsection.1.2}}
\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}Magasin}{1}{subsection.1.3}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}Doinjon}{1}{subsection.1.4}}
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.5}bouton enregistrement/chargement de partie}{1}{subsection.1.5}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}Donjon}{1}{subsection.1.4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.5}Enregistrement/chargement de partie}{1}{subsection.1.5}}
\@writefile{toc}{\contentsline {subsection}{\numberline {1.6}Interface utilisateur}{2}{subsection.1.6}}
\@writefile{toc}{\contentsline {section}{\numberline {2}Technologie}{2}{section.2}}
\@writefile{toc}{\contentsline {section}{\numberline {3}Planification}{2}{section.3}}