diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-28 01:33:42 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-28 01:33:42 +0300 |
| commit | 0661bcba3210be9714b1943935ba4cb7e6e04eec (patch) | |
| tree | 41becb5df2300747c26f765634771a57175c2cd5 /release | |
| parent | df3e7d0361c6e151bc306e1ef71e006e955d1d39 (diff) | |
| parent | 111179beb0b12cfcc7075935262241c65f04fb84 (diff) | |
Merge branch 'blender2.7'
Conflicts:
source/blender/windowmanager/intern/wm_operators.c
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 193d9e32870..12b0e4df912 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1026,7 +1026,7 @@ class WM_OT_doc_view(Operator): if bpy.app.version_cycle == "release": _prefix = ("https://docs.blender.org/api/current") else: - _prefix = ("https://docs.blender.org/api/master") + _prefix = ("https://docs.blender.org/api/blender2.7") def execute(self, context): url = _wm_doc_get_id(self.doc_id, do_url=True, url_prefix=self._prefix) |