manual merge of the scolobb page

1 files changed, 5 insertions, 41 deletions

diff --git a/community/scolobb.mdwn b/community/scolobb.mdwn
index 6c959f1e..f265740f 100644
--- a/community/scolobb.mdwn
+++ b/community/scolobb.mdwn
@@ -33,31 +33,24 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
 * The skeleton which mirrors the filesystem.
 
 ####TODO:
-<<<<<<< HEAD:community/scolobb.mdwn
 
-<<<<<<< HEAD:community/scolobb.mdwn
-* Provide shadow nodes (modify the standard version of netfs_S_dir_lookup).
-=======
+''(I manually fixed a broken merge, so this TODO might contain outdated information - ArneBab )''
+
 * Implemented the propagation of a translator on all files belonging
   to directory 'dir' in the case of the following query: 'dir,,x'
   (might change, see the thing with "recursive wrappers")
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 
-<<<<<<< HEAD:community/scolobb.mdwn
 * Create the generic filter translator.
-=======
+
 * Any translator can access the untranslated version of the node it is
   to be set upon by specifying the corresponding flags to the
   <lib>_startup routine, where <lib> is the name of the library used
   to create the translator.
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 
 * Create the translator '0' (providing the untranslated version of the
   node).
 
 * Create the "recursive wrappers" for one-node translators.
-=======
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 
 * Provide proxy nodes (modify the standard version of netfs_S_dir_lookup).
 
@@ -76,51 +69,22 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
 
 * Kill bugs.
 
-<<<<<<< HEAD:community/scolobb.mdwn
-<<<<<<< HEAD:community/scolobb.mdwn
-=======
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 * Integrate nsmux upstream.
 
-<<<<<<< HEAD:community/scolobb.mdwn
-=======
->>>>>>> web commit by scolobb:community/scolobb.mdwn
-=======
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 * Solve the libtrivfs stacking issue.
 
-<<<<<<< HEAD:community/scolobb.mdwn
-<<<<<<< HEAD:community/scolobb.mdwn
-=======
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 * Patch libnetfs (it does not support file_get_translator_cntl, for
   instance).
-<<<<<<< HEAD:community/scolobb.mdwn
-=======
+
 * Patch libnetfs (?).
->>>>>>> web commit by scolobb:community/scolobb.mdwn
-=======
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 
 ---
 
 ###Progress
 
-<<<<<<< HEAD:community/scolobb.mdwn
-####6: Sun Aug 3 - ?:
-=======
 ####6: Mon Aug 4 - ?
->>>>>>> web commit by scolobb:community/scolobb.mdwn
-
-<<<<<<< HEAD:community/scolobb.mdwn
-<<<<<<< HEAD:community/scolobb.mdwn
-> Implement the shadow nodes.
-=======
-> Implemeting the proxy nodes.
->>>>>>> web commit by scolobb:community/scolobb.mdwn
-=======
+
 > Implementing the proxy nodes.
->>>>>>> web commit by scolobb:community/scolobb.mdwn
 
 ####5: Thu Jul 24 - Thu Jul 24: