summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-17 06:36:59 (GMT)
committerGeorg Brandl <georg@python.org>2014-03-17 06:36:59 (GMT)
commit3a748ca982b242219686e8469f121512d3f3cc92 (patch)
tree00de8894a22de8d100aa16d960ac3ce5740cc598
parentf5002bd6ac961b45dea14ec34a8802fa65cacbde (diff)
parenta7f48019d5550e071f364e18a17ff38b90e266bb (diff)
downloadcpython-3a748ca982b242219686e8469f121512d3f3cc92.zip
cpython-3a748ca982b242219686e8469f121512d3f3cc92.tar.gz
cpython-3a748ca982b242219686e8469f121512d3f3cc92.tar.bz2
merge with 3.4
-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',