Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-11-03 22:51:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	examples/example_marmalade/main.cpp
#	imgui.cpp
#	imgui.h
This commit is contained in:
ocornut
2021-12-22 16:02:04 +01:00
parent 06d5f9297d 512c54bbc0
commit 15b4a064f9
19 changed files with 54 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui_internal.h
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.86 WIP
// dear imgui, v1.86
// (internal structures/api)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!