1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-05 04:10:07 +00:00

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar 2019-06-17 11:10:14 +02:00
commit b27fd87177
9 changed files with 38 additions and 32 deletions

View file

@ -1,4 +1,4 @@
// dear imgui, v1.71
// dear imgui, v1.72 WIP
// (widgets code)
/*