diff options
| author | Araq <rumpf_a@web.de> | 2013-12-24 01:30:48 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-24 01:30:48 +0100 |
| commit | 1081c104d06c084e73230d0c7fc73b3824fb4f1d (patch) | |
| tree | a1861108b9788f961023091d391be7968f187c50 /doc | |
| parent | c3b3339e779dfe19ed1891295a763aea47981131 (diff) | |
| parent | feb9af48f1600ce814bc3b62765894ba503ec108 (diff) | |
| download | Nim-1081c104d06c084e73230d0c7fc73b3824fb4f1d.tar.gz | |
Merge branch 'vm2' of github.com:Araq/Nimrod into vm2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/keywords.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/keywords.txt b/doc/keywords.txt index fa3ce4786..2d18d7969 100644 --- a/doc/keywords.txt +++ b/doc/keywords.txt @@ -7,13 +7,14 @@ finally for from generic if import in include interface is isnot iterator lambda let -macro method mixin using mod +macro method mixin mod nil not notin object of or out proc ptr raise ref return shared shl shr static template try tuple type +using var when while with without xor |