merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-08 21:28:42 +02:00
commit 100580f4c4
1 changed files with 1 additions and 1 deletions

View File

@ -704,7 +704,7 @@ Delimiters
The following tokens serve as delimiters in the grammar:: The following tokens serve as delimiters in the grammar::
( ) [ ] { } ( ) [ ] { }
, : . ; @ = , : . ; @ = ->
+= -= *= /= //= %= += -= *= /= //= %=
&= |= ^= >>= <<= **= &= |= ^= >>= <<= **=