diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:58:27 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:59:26 +0300 |
commit | 24d29f2e500771257cc962e899630edaccb01cfe (patch) | |
tree | 600780f0dab7f3efe5477eb24d59c533bc2abdc6 /release/scripts/startup/bl_ui/__init__.py | |
parent | 11af9e9a5bd1caff1ec46794bda2934a01ce5035 (diff) | |
parent | 3054e33d67c8f524dae915c8f1f016a7bfa63ab0 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'release/scripts/startup/bl_ui/__init__.py')
-rw-r--r-- | release/scripts/startup/bl_ui/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 46dd59aa26b..ac150392109 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -125,7 +125,7 @@ def register(): WindowManager.addon_filter = EnumProperty( items=addon_filter_items, name="Category", - description="Filter addons by category", + description="Filter add-ons by category", ) WindowManager.addon_support = EnumProperty( |