diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /doc/python_api/rst/info_quickstart.rst | |
parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'doc/python_api/rst/info_quickstart.rst')
-rw-r--r-- | doc/python_api/rst/info_quickstart.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/python_api/rst/info_quickstart.rst b/doc/python_api/rst/info_quickstart.rst index 8ded6e6fae0..ab106dd3bb7 100644 --- a/doc/python_api/rst/info_quickstart.rst +++ b/doc/python_api/rst/info_quickstart.rst @@ -59,7 +59,7 @@ text editor or entering commands in the Python console. Both the *Text Editor* and *Python Console* are space types you can select from the view header. -Rather then manually configuring your spaces for Python development, +Rather than manually configuring your spaces for Python development, you may prefer to use the *Scripting* screen, included default with Blender, accessible from the top headers screen selector. |