diff options
| author | Howard Trickey <howard.trickey@gmail.com> | 2020-07-19 02:58:41 +0300 |
|---|---|---|
| committer | Howard Trickey <howard.trickey@gmail.com> | 2020-07-19 02:58:41 +0300 |
| commit | 41722bfaa6ea90291d0a616db1bbc5fca59bf2b4 (patch) | |
| tree | 13e7a533bbd16eaa33b14ac1fc2598bc784a3217 /source/blender/blenlib/BLI_mpq2.hh | |
| parent | 64e462f68853f8f2fae9398c90e858c3f29891d3 (diff) | |
Fix a strange merge problem, and fix a couple of warnings.
Diffstat (limited to 'source/blender/blenlib/BLI_mpq2.hh')
0 files changed, 0 insertions, 0 deletions