diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /release/datafiles/blender_icons16/icon16_tria_left_bar.dat | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'release/datafiles/blender_icons16/icon16_tria_left_bar.dat')
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_tria_left_bar.dat | bin | 0 -> 1048 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/blender_icons16/icon16_tria_left_bar.dat b/release/datafiles/blender_icons16/icon16_tria_left_bar.dat Binary files differnew file mode 100644 index 00000000000..15826007e7b --- /dev/null +++ b/release/datafiles/blender_icons16/icon16_tria_left_bar.dat |