diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:16:14 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:16:14 +0300 |
| commit | 83a2d3dcf5a73f907c741038d5c55cb9f7aff1f9 (patch) | |
| tree | 46e8c12b29369072f487de5920f33a3e7148176e /source/blender/windowmanager/intern/wm_widgets.c | |
| parent | 9f8eb0e1eb220015f0cff530bcb0491828f05c99 (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-experiments
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_widgets.c')
0 files changed, 0 insertions, 0 deletions