1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-23 02:04:22 +00:00

Merge branch 'viewport' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar 2018-12-04 00:06:26 +01:00
commit 5105c6c0d0
11 changed files with 47 additions and 25 deletions

View file

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