1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-16 00:54:19 +00:00

Merge branch 'viewport' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_widgets.cpp
This commit is contained in:
omar 2018-11-22 15:29:18 +01:00
commit 2515413080
12 changed files with 63 additions and 35 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.65
// dear imgui, v1.66
// (widgets code)
/*