| commit | 582f4db59bc9f14c2ed80e43cc7d9472587988d7 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Thu May 07 22:13:47 2020 +0200 |
| committer | omar <omarcornut@gmail.com> | Thu May 07 22:13:47 2020 +0200 |
| tree | 7f6fc5f59718d077877166068a21180b84145e07 | |
| parent | 5116eee108986ba6f41eea6f8759eb6acc042670 [diff] | |
| parent | d33021d82816a9e256301331e7ec84fd4cd7ddc2 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_internal.h