| commit | 0bdc1453433ab0bb4d889c72ef9b0353ba3998aa | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Sat Aug 31 19:19:00 2019 +0200 |
| committer | omar <omarcornut@gmail.com> | Sat Aug 31 19:19:00 2019 +0200 |
| tree | 692d7265fc18974a351cecfcb2bbb70e688e7f4c | |
| parent | d049a7988c9c569ff240533e96d8500f3a715cab [diff] | |
| parent | 0537ac005f7e76311556a4e24c8ddfb4fa1bdcc8 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h