Merge branch 'maint'

diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index b9baa1d3b4685859d6ad3530a64865cc054df7a3..01354c2bb5da56181de3b88052e1d921986f1f95 100644 (file)
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -296,15 +296,15 @@ diff --git a/pico/pico.c b/pico/pico.c
 --- a/pico/pico.c
 +++ b/pico/pico.c
 @@ -219,7 +219,9 @@ PICO *pm;
-           switch(pico_all_done){      /* prepare for/handle final events */
-             case COMP_EXIT :          /* already confirmed */
-               packheader();
+           switch(pico_all_done){      /* prepare for/handle final events */
+             case COMP_EXIT :          /* already confirmed */
+               packheader();
 +#if 0
-               stripwhitespace();
+               stripwhitespace();
 +#endif
-               c |= COMP_EXIT;
-               break;
- 
+               c |= COMP_EXIT;
+               break;
+
 
 (Daniel Barkalow)