diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-06-23 07:33:50 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-06-23 07:33:50 +0300 |
commit | 7759782ee7c4e654641c9f7abb51631c86e3f29c (patch) | |
tree | f2fff5a65ea18924c9cd97b1534137600aba169b /source/blender/editors/space_info/info_ops.c | |
parent | ab9eee4bfb91e1147333b98516dba0e97c27d4de (diff) | |
parent | f1917a2188df630d860a5ffa013d519f3d2d74c1 (diff) |
Merge branch 'master' into UI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/editors/space_info/info_ops.c')
0 files changed, 0 insertions, 0 deletions