| commit | 6cc380fc4168c0cde2bbbe6182525f4bb47899e2 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Wed Sep 26 21:34:52 2018 +0200 |
| committer | omar <omarcornut@gmail.com> | Wed Sep 26 21:34:52 2018 +0200 |
| tree | e8a170735cf348c01ba78a8b34ad7eda56ed8c3a | |
| parent | 11278041092db5bf6b1576a91a0f438b81e528f0 [diff] | |
| parent | 61d94ff88e480e9a76c85709de68b59b0906cb3a [diff] |
Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_win32.cpp # examples/imgui_impl_win32.h # imgui.cpp