# HG changeset patch
# User Olivier Delalleau <delallea@iro>
# Date 1283545866 14400
# Node ID f3801e0e3913e9755f809cbe380751c0c6d2cb9e
# Parent  fb6cae14fd0755e544f35b9237320d3371785e5d# Parent  e21b3fdec4efed2b3fb23fa0af23f67cc6ef88d9
Merged

diff -r fb6cae14fd07 -r f3801e0e3913 doc/v2_planning/coding_style.txt
--- a/doc/v2_planning/coding_style.txt	Fri Sep 03 16:30:50 2010 -0400
+++ b/doc/v2_planning/coding_style.txt	Fri Sep 03 16:31:06 2010 -0400
@@ -40,3 +40,7 @@
 compatible as possible with Python 3?
 
 
+C coding style:
+---------------
+
+We also need a c-style coding style.
diff -r fb6cae14fd07 -r f3801e0e3913 doc/v2_planning/existing_python_ml_libraries.txt
--- a/doc/v2_planning/existing_python_ml_libraries.txt	Fri Sep 03 16:30:50 2010 -0400
+++ b/doc/v2_planning/existing_python_ml_libraries.txt	Fri Sep 03 16:31:06 2010 -0400
@@ -15,4 +15,4 @@
  * Orange
  * Shogun python bindings
  * libsvm python bindings
-
+ * scikits.learn