diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /doc/python_api/examples/bpy.props.py | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'doc/python_api/examples/bpy.props.py')
| -rw-r--r-- | doc/python_api/examples/bpy.props.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/python_api/examples/bpy.props.py b/doc/python_api/examples/bpy.props.py index f6bc55d6824..c199bd9b83a 100644 --- a/doc/python_api/examples/bpy.props.py +++ b/doc/python_api/examples/bpy.props.py @@ -6,7 +6,7 @@ Custom properties can be added to any subclass of an :class:`ID`, :class:`Bone` and :class:`PoseBone`. These properties can be animated, accessed by the user interface and python -like blenders existing properties. +like Blender's existing properties. """ import bpy |