Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-13 00:09:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
This commit is contained in:
omar
2020-04-12 20:24:18 +02:00
parent 71eb4034eb 5503c0a12e
commit b8e2b2bd6b
34 changed files with 213 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_vulkan.h
View File

@ -22,7 +22,7 @@
// Read comments in imgui_impl_vulkan.h.
#pragma once
#include "imgui.h" // IMGUI_IMPL_API
#include <vulkan/vulkan.h>
// Initialization data, for ImGui_ImplVulkan_Init()