diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/space_userpref | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_userpref')
| -rw-r--r-- | source/blender/editors/space_userpref/space_userpref.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_userpref/userpref_intern.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_userpref/userpref_ops.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index 1d3c24c518a..fc5182fcb4f 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -196,4 +196,3 @@ void ED_spacetype_userpref(void) BKE_spacetype_register(st); } - diff --git a/source/blender/editors/space_userpref/userpref_intern.h b/source/blender/editors/space_userpref/userpref_intern.h index d67ba32f68b..720b4da0f71 100644 --- a/source/blender/editors/space_userpref/userpref_intern.h +++ b/source/blender/editors/space_userpref/userpref_intern.h @@ -34,4 +34,3 @@ /* internal exports only */ #endif /* __USERPREF_INTERN_H__ */ - diff --git a/source/blender/editors/space_userpref/userpref_ops.c b/source/blender/editors/space_userpref/userpref_ops.c index c5a62f46c36..6666a6cfc16 100644 --- a/source/blender/editors/space_userpref/userpref_ops.c +++ b/source/blender/editors/space_userpref/userpref_ops.c @@ -31,5 +31,3 @@ #include <string.h> #include <stdio.h> - - |