web commit by scolobb

1 files changed, 41 insertions, 1 deletions

diff --git a/community/scolobb.mdwn b/community/scolobb.mdwn
index c4c4cbda..4563df39 100644
--- a/community/scolobb.mdwn
+++ b/community/scolobb.mdwn
@@ -34,15 +34,39 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
 
 ####TODO:
 
+<<<<<<< HEAD:community/scolobb.mdwn
 * Provide shadow nodes (modify the standard version of netfs_S_dir_lookup).
+=======
+* 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.
 
+* Provide proxy nodes.
+
+* Create the generic filtering translator.
+
+* Create the translator '0' (providing the untranslated version of the
+  node).
+
+* Integrate nsmux upstream (fearful :-( ).
+
+* Create the "recursive wrappers" for one-node translators.
+
 * Create special translators for the main proxy so that its functionality
   should be complete.
 
@@ -51,20 +75,35 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
 
 * Kill bugs.
 
+<<<<<<< HEAD:community/scolobb.mdwn
 * Integrate nsmux upstream.
 
+=======
+>>>>>>> web commit by scolobb:community/scolobb.mdwn
 * Solve the libtrivfs stacking issue.
 
+<<<<<<< HEAD:community/scolobb.mdwn
 * Patch libnetfs (it does not support file_get_translator_cntl, for
   instance).
+=======
+* Patch libnetfs (?).
+>>>>>>> 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
 > Implement the shadow nodes.
+=======
+> Implemeting the proxy nodes.
+>>>>>>> web commit by scolobb:community/scolobb.mdwn
 
 ####5: Thu Jul 24 - Thu Jul 24:
 
@@ -106,4 +145,5 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
 
 ####0: Sun Apr 27:
 
-> Followed the code of *dmesgd* (<http://www.bddebian.com/junk/dmesgd/>) kindly offered by **bddebian** and rewritten it from scratch as a tutorial.
+> Followed the code of *dmesgd* (<http://www.bddebian.com/junk/dmesgd/>) kindly offered by **bddebian** and rewrote it from scratch as a tutorial.
+