| commit | 00c95610b67eab935cd89dedc371e056d8add694 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Aug 06 19:21:49 2020 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu Aug 06 19:21:49 2020 +0200 |
| tree | 0aaa7d5144aa2b1a9dcfbef0697fbe61d3d35f6f | |
| parent | 70ee6a8afc9ecaf3ce0e54129769e1132984b0e0 [diff] | |
| parent | de1588928b69cee4efa7eada429d08a48695fb79 [diff] |
Merge branch 'docking' into features/logarithmic_sliders_docking # Conflicts: # imgui.cpp # imgui.h