| commit | 3b014d0c31f7149957ea2ae65b057cbe6003ebd0 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Sep 17 12:07:30 2019 +0200 |
| committer | omar <omarcornut@gmail.com> | Tue Sep 17 12:07:30 2019 +0200 |
| tree | 228c8c7750cc75f5b2319ddc4a0432ff5d11e622 | |
| parent | 3f986e72d955795ea0306c2b6c1007dc0ad53776 [diff] | |
| parent | 1c951dca977e24018110aff7374d7cb3a062e5da [diff] |
Merge branch 'features/ellipsis_rendering' # Conflicts: # imgui.cpp