| Merge branch 'master' into examples_refactor | 
|---|
| .travis.yml | 
|---|
| examples/directx10_example/main.cpp | 
|---|
| examples/directx11_example/main.cpp | 
|---|
| examples/directx9_example/main.cpp | 
|---|
| examples/imgui_impl_dx10.cpp | 
|---|
| examples/imgui_impl_dx11.cpp | 
|---|
| examples/imgui_impl_dx9.cpp | 
|---|
| examples/imgui_impl_opengl2.cpp | 
|---|
| examples/imgui_impl_opengl3.cpp | 
|---|
| examples/imgui_impl_sdl2.cpp | 
|---|
| examples/imgui_impl_vulkan.cpp | 
|---|
| examples/imgui_impl_win32.cpp | 
|---|
| imgui.cpp | 
|---|
| imgui_internal.h | 
|---|