Skip to content

Commit

Permalink
Merge pull request #39 from jamesray1/patch-2
Browse files Browse the repository at this point in the history
958 -> 969
  • Loading branch information
lrettig authored Apr 9, 2018
2 parents 3e6aea2 + 2011cff commit 8410293
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion All Core Devs Meetings/Meeting 36.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
1. Testing
2. [EIP 712: Add eth_signTypedData as a standard for machine-verifiable and human-readable typed data signing with Ethereum keys](https://github.com/ethereum/pm/issues/33#issuecomment-374174501).
3. [EIP 665: Add precompiled contract for Ed25519 signature verification](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-665.md).
4. [EIP 958: Modify block mining to be ASIC resistant](https://github.com/ethereum/EIPs/issues/958).
4. [EIP 969: Modify block mining to be ASIC resistant](http://eips.ethereum.org/EIPS/eip-969).
5. [EIP 960: Cap total ether supply at ~120 million](https://github.com/ethereum/EIPs/issues/960).
6. [EIP process updates](http://eips.ethereum.org/).
7. Research Updates.
Expand Down

0 comments on commit 8410293

Please sign in to comment.