mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-17 01:04:19 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar 2020-06-29 17:15:40 +02:00
commit ddabfc3477
10 changed files with 53 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/README.txt
View file

@ -1,5 +1,5 @@
-----------------------------------------------------------------------
dear imgui, v1.77 WIP
dear imgui, v1.77
-----------------------------------------------------------------------
examples/README.txt
(This is the README file for the examples/ folder. See docs/ for more documentation)