Combine bulk-memory-ops + cond-seg-init proposals (WebAssembly#5)

Also remove some of the stuff from the bulk memory proposal that really should be written in the spec ReST files.
eqrion · Jan 18, 2018 · dd356d5 · dd356d5
1 parent 83b7620
commit dd356d5
Show file tree

Hide file tree

Showing 3 changed files with 204 additions and 285 deletions.
diff --git a/README.md b/README.md
@@ -10,12 +10,6 @@ and `memset`) to WebAssembly.
 See the [overview](proposals/bulk-memory-operations/Overview.md) for a summary of the
 proposal.
 
-This proposal also includes functionality to conditionally initialize data and
-elem segments that was previously coupled with the
-[thread proposal](https://github.com/WebAssembly/threads). This is currently in a
-[separate overview document](proposals/bulk-memory-operations/ConditionalSegmentInitialization.md)
-but will combined into the main overview soon.
-
 Original README from upstream repository follows...
 
 # spec

diff --git a/proposals/bulk-memory-operations/ConditionalSegmentInitialization.md b/proposals/bulk-memory-operations/ConditionalSegmentInitialization.md