[Python-Dev] cpython (merge 2.6 -> 2.7): merge with 2.6

[Georg Brandl]

Am 28.10.2012 12:13, schrieb Antoine Pitrou:
> On Sun, 28 Oct 2012 08:05:00 +0100 (CET)
> georg.brandl <python-checkins at python.org> wrote:
>> http://hg.python.org/cpython/rev/ee33671b2c6a
>> changeset:   79995:ee33671b2c6a
>> branch:      2.7
>> parent:      79983:7ca30af90c11
>> parent:      79994:4a17784f2fee
>> user:        Georg Brandl <georg at python.org>
>> date:        Sun Oct 28 08:06:11 2012 +0100
>> summary:
>>   merge with 2.6
>> 
>> files:
>>   Doc/tools/sphinxext/static/version_switch.js |  18 +++++----
>>   1 files changed, 10 insertions(+), 8 deletions(-)
> 
> Is it deliberate for our Javascript code to use 2-space indents?

Yes.

Georg