Merge branch 'master' into viewport

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/opengl2_example/imgui_impl_glfw_gl2.cpp
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/vulkan_example/main.cpp
#	imgui.h
This commit is contained in:
omar
2018-04-09 19:35:14 +02:00
16 changed files with 87 additions and 90 deletions

View File

@ -192,6 +192,7 @@ int main(int, char**)
if (g_pd3dDevice) g_pd3dDevice->Release();
if (pD3D) pD3D->Release();
DestroyWindow(hwnd);
UnregisterClass(_T("ImGui Example"), wc.hInstance);
return 0;