| commit | 7fbd72b73520c2f68e0a90d0d02b95f522b30ca5 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Jul 23 21:40:57 2019 -0700 |
| committer | omar <omarcornut@gmail.com> | Tue Jul 23 21:40:57 2019 -0700 |
| tree | 935ebe88fb723b00275513128ac8d1961d4dd396 | |
| parent | 969278fc0b4c1744f7223a90d4279569db690086 [diff] | |
| parent | 824e8c53b43aa1bd0ed799ad563f7fa01cde4484 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h