summaryrefslogtreecommitdiffstats
path: root/Doc/tools
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-17 06:36:51 (GMT)
committerGeorg Brandl <georg@python.org>2014-03-17 06:36:51 (GMT)
commita7f48019d5550e071f364e18a17ff38b90e266bb (patch)
treeabde23ee76b9a93bb49b680d1905bebd2113b6c9 /Doc/tools
parent3c5c56f3c068bc13daea2275b951113b43a91e85 (diff)
parent56d3a03f706b54be307f7627db6d881eb851d2b1 (diff)
downloadcpython-a7f48019d5550e071f364e18a17ff38b90e266bb.zip
cpython-a7f48019d5550e071f364e18a17ff38b90e266bb.tar.gz
cpython-a7f48019d5550e071f364e18a17ff38b90e266bb.tar.bz2
merge with 3.3
Diffstat (limited to 'Doc/tools')
-rw-r--r--Doc/tools/sphinxext/static/version_switch.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/sphinxext/static/version_switch.js
index cc7be1c..e5528eb 100644
--- a/Doc/tools/sphinxext/static/version_switch.js
+++ b/Doc/tools/sphinxext/static/version_switch.js
@@ -2,7 +2,8 @@
'use strict';
var all_versions = {
- '3.4': 'dev (3.4)',
+ '3.5': 'dev (3.5)',
+ '3.4': '3.4',
'3.3': '3.3',
'3.2': '3.2',
'2.7': '2.7',