diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-18 17:12:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-18 17:12:56 +0300 |
| commit | 24b3b9fa215b52fc38a3238e7216f8cadce0620e (patch) | |
| tree | 8b38acc50fa9e6474b2fc1f9d9f384c151feb297 /source/blender/draw | |
| parent | 3b209a45de420a4e4e98ab71c6e1c521612171fa (diff) | |
Fix bad merge conflict resolution
Line got lost..
Diffstat (limited to 'source/blender/draw')
0 files changed, 0 insertions, 0 deletions