Skip to content

Commit

Permalink
Merge master (#129)
Browse files Browse the repository at this point in the history 
* Update howto.md (#124)

* Changed references to master to main

* Move CSP proposal to phase 3 (#125)

* Move branch hinting to phase 3 (#127)

Co-authored-by: Francis McCabe <[email protected]>
Co-authored-by: Sergey Rubanov <[email protected]>
Co-authored-by: Thomas Lively <[email protected]>
  • Loading branch information
@ngzhian @fgmccabe
@chicoxyzzy @tlively
4 people authored Nov 9, 2021
1 parent 0d93ca5 commit fa33e2c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ _These proposals have not yet been merged to the spec. Merged proposals are list
| [Custom Annotation Syntax in the Text Format][custom_annotation_syntax_in_the_text_format] | Andreas Rossberg |
| [Memory64][memory64] | Wouter van Oortmerssen |
| [Exception handling][exception_handling] | Heejin Ahn |
| [Web Content Security Policy][web_content_security_policy] | Francis McCabe |
| [Branch Hinting][branch-hinting] | Yuri Iozzelli |

### Phase 2 - Proposed Spec Text Available (CG + WG)

Expand All @@ -40,7 +42,6 @@ _These proposals have not yet been merged to the spec. Merged proposals are list
| [Typed Function References][function_references] | Andreas Rossberg |
| [Relaxed dead code validation][relaxed-dead-code-validation] | Conrad Watt and Ross Tate |
| [Numeric Values in WAT Data Segments][numeric-values-in-wat] | Ezzat Chamudi |
| [Branch Hinting][branch-hinting] | Yuri Iozzelli |
| [Instrument and Tracing Technology][instrument-tracing] | Richard Winterton |
| [Relaxed SIMD][relaxed-simd] | Marat Dukhan & Zhi An Ng |

Expand All @@ -58,10 +59,9 @@ _These proposals have not yet been merged to the spec. Merged proposals are list
| [Call Tags][call-tags] | Ross Tate |
| [Module Linking][module_linking] | Luke Wagner and Andreas Rossberg |
| [Extended Constant Expressions][extended-const] | Sam Clegg |
| [Web Content Security Policy][web_content_security_policy] | Francis McCabe |
| [Stack Switching][stack-switching] | Francis McCabe & Sam Lindley |
| [Constant Time][constant-time] | Sunjay Cauligi, Garrett Gu, John Renner, Hovav Shacham, Deian Stefan, Conrad Watt |
| [JS Promise Integration][js-promise-integration] | Ross Tate and Francis McCabe |
| [JS Promise Integration][js-promise-integration] | Ross Tate and Francis McCabe |

### Phase 0 - Pre-Proposal (CG)

Expand Down

0 comments on commit fa33e2c

Please sign in to comment.