diff options
author | ack-err <ack-err> | 2013-09-02 22:50:57 +0400 |
---|---|---|
committer | ack-err <ack-err> | 2013-09-02 22:50:57 +0400 |
commit | 76b91a29f59bfedf566bed188511f7f95d8082a2 (patch) | |
tree | 248c77ae2133d42d4424d89b2c7a0ddbb723a0de /source/blender/editors/space_view3d/space_view3d.c | |
parent | d2815ece39063aa03864afc37e96764029bb3228 (diff) |
Resolved conflicts in icon file.
Diffstat (limited to 'source/blender/editors/space_view3d/space_view3d.c')
0 files changed, 0 insertions, 0 deletions