summary refs log tree commit diff stats
path: root/tools/cmerge.nim
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@googlemail.com>2018-01-17 15:06:32 +0000
committerGitHub <noreply@github.com>2018-01-17 15:06:32 +0000
commitb754bfabb625d9ecac4939a156e0499e0f476370 (patch)
treea4aac963ba00a02e454c96a212df1f2adffda203 /tools/cmerge.nim
parent399c5e38b7bf7a0998ca9ed4bce57c7092d59229 (diff)
parentc93655e8b492dacbf35e5152e716035e112c899f (diff)
downloadNim-b754bfabb625d9ecac4939a156e0499e0f476370.tar.gz
Merge pull request #7023 from yglukhov/unify-async
Unify async macro and futures for js and native targets
Diffstat (limited to 'tools/cmerge.nim')
0 files changed, 0 insertions, 0 deletions