commit 79b1cab1fcb376776021f919b5bed9e1a28d44ed
parent c951ece87969145fb562009ba694333e66af90ca
Author: John Charron <rm_rf_windows@yahoo.fr>
Date: Thu, 24 Mar 2011 10:19:26 +0100
Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable
Diffstat:
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/rapport/rapport.tex b/rapport/rapport.tex
@@ -426,7 +426,8 @@ Making people play for Lexical Acquisition. In Proc. SNLP 2007, 7th Symposium on
\subsection{Java}
-Code Conventions for the Java Programming Language, Oracle, 1999. (\url{http://www.oracle.com/technetwork/java/codeconvtoc-136057.html, www.oracle.com/technetwork/java/codeconventions-150003.pdf})
+Code Conventions for the Java Programming Language, Oracle, 1999. (\url{http://www.oracle.com/technetwork/java/codeconvtoc-136057.html,
+ www.oracle.com/technetwork/java/codeconventions-150003.pdf})
\subsection{Android}
@@ -453,6 +454,18 @@ $*$ & r\_holo & 10 & Fait partie de (patte -> chat) \\
\end{tabular}
\newpage
+\section{Notes Bertrand}
+\subsection{Outils}
+\subsubsection{Android}
+\subsubsection{Git}
+\subsubsection{Eclipse}
+\subsubsection{Visual Paradigm}
+\subsection{Language de programmation}
+\subsubsection{Java}
+\subsubsection{PHP}
+\subsubsection{SHELL}
+\newpage
+
\appendix
\section{Annexe A}