diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/makesrna/intern/rna_wm.c | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 09451599ce5..fd477f1106e 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -319,7 +319,7 @@ EnumPropertyItem event_type_items[] = { {TIMERJOBS, "TIMER_JOBS", 0, "Timer Jobs", ""}, {TIMERAUTOSAVE, "TIMER_AUTOSAVE", 0, "Timer Autosave", ""}, {TIMERREPORT, "TIMER_REPORT", 0, "Timer Report", ""}, - {TIMERREGION, "TIMER_REGION", 0, "Timer Region", ""}, + {TIMERREGION, "TIMERREGION", 0, "Timer Region", ""}, {0, "", 0, NULL, NULL}, {NDOF_MOTION, "NDOF_MOTION", 0, "NDOF Motion", ""}, /* buttons on all 3dconnexion devices */ |