diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
| commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
| tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /release/datafiles/blender_icons16/icon16_snap_grid.dat | |
| parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'release/datafiles/blender_icons16/icon16_snap_grid.dat')
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_snap_grid.dat | bin | 0 -> 1048 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/blender_icons16/icon16_snap_grid.dat b/release/datafiles/blender_icons16/icon16_snap_grid.dat Binary files differnew file mode 100644 index 00000000000..4def9b8df2e --- /dev/null +++ b/release/datafiles/blender_icons16/icon16_snap_grid.dat |