| commit | 87ded34f9f7f13f99130c171632bc8e21b857d62 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Fri Feb 22 12:29:18 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Fri Feb 22 12:29:18 2019 +0100 |
| tree | 6f753847296f0892157afdae1a3c850b11c6edbe | |
| parent | ff0f9aa8565e2b5092cbe05e44798e9e04dd445e [diff] | |
| parent | 9da48c16c5eeb8ea98e89951c83fab0f9d2b037b [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui_widgets.cpp