summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
authorGNU Hurd wiki engine <web-hurd@gnu.org>2008-08-07 15:34:27 +0000
committerGNU Hurd wiki engine <web-hurd@gnu.org>2008-08-13 11:54:27 +0200
commit45aa49d8ed8207ff16c40eb1f672bea0bbf004ef (patch)
treecea25fb745257a33a228f70933f03bbe8536eccf /community
parent17209cd96654fbb2d61f7ad005ab05ef6eca6725 (diff)
web commit by scolobb
Diffstat (limited to 'community')
-rw-r--r--community/scolobb.mdwn23
1 files changed, 20 insertions, 3 deletions
diff --git a/community/scolobb.mdwn b/community/scolobb.mdwn
index 62670855..6c959f1e 100644
--- a/community/scolobb.mdwn
+++ b/community/scolobb.mdwn
@@ -33,6 +33,7 @@ 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).
@@ -55,16 +56,16 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
node).
* Create the "recursive wrappers" for one-node translators.
+=======
+>>>>>>> web commit by scolobb:community/scolobb.mdwn
-* Provide proxy nodes.
+* Provide proxy nodes (modify the standard version of netfs_S_dir_lookup).
* Create the generic filtering translator.
* Create the translator '0' (providing the untranslated version of the
node).
-* Integrate nsmux upstream.
-
* Create the "recursive wrappers" for one-node translators.
* Create special translators for the main proxy so that its functionality
@@ -76,18 +77,30 @@ 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
---
@@ -100,10 +113,14 @@ The code is at <http://github.com/scolobb/nsmux/tree/master>.
>>>>>>> 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: