| commit | 81a2546cea5c53a8ea742337a67f4ab99a3df1ab | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Thu Dec 20 23:06:29 2018 +0100 |
| committer | omar <omarcornut@gmail.com> | Thu Dec 20 23:06:29 2018 +0100 |
| tree | 30ede5089658ff1b2f60bfa6dd77cd9104cff914 | |
| parent | 5794c0491ad8f11beaea512e25d40714cec760f4 [diff] | |
| parent | ee5560a958a9568bdf053319af8c38c1e11f755e [diff] |
Merge branch 'viewport' into docking # Conflicts: # examples/example_allegro5/main.cpp # examples/example_win32_directx9/main.cpp