| commit | 1b28be4330f47093e24bbeeb396a99654715641f | [log] [tgz] |
|---|---|---|
| author | Gregory P. Smith <greg@krypto.org> | Mon Nov 25 00:32:20 2013 -0800 |
| committer | Gregory P. Smith <greg@krypto.org> | Mon Nov 25 00:32:20 2013 -0800 |
| tree | 0a57eb5fcae148ef3eb3730b528aaaae4888a1e9 | |
| parent | 65482570f1fa660bd95e1daf4ecc6acd65f0d34e [diff] | |
| parent | a89ecc7d237c3f409afbbee4d736fadfda810a18 [diff] |
merge heads
diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 2f0e796..312fc40 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c
@@ -1558,7 +1558,7 @@ "class C(object):\n" " @property\n" " def x(self):\n" -" \"\I am the 'x' property.\"\n" +" \"I am the 'x' property.\"\n" " return self._x\n" " @x.setter\n" " def x(self, value):\n"