| commit | 82e31d34f086070dc49228c4e8619b053331b27d | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Fri Jan 18 12:31:33 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Fri Jan 18 12:31:33 2019 +0100 |
| tree | 10cfe59ce88d36cd8f3ab525d84b073cae9054e3 | |
| parent | acdb4823dd9a4c71ef621935c0310180ac29531a [diff] | |
| parent | 92d29531fa5294e0684969f9dc33126379e6f02d [diff] |
Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp