Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-04 12:08:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar
2019-05-10 22:56:43 +02:00
parent 239c8732d7 7c256fbd40
commit 835a8b2c9b
10 changed files with 462 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/README.txt
View File

@ -1,5 +1,5 @@
-----------------------------------------------------------------------
dear imgui, v1.70 WIP
dear imgui, v1.71 WIP
-----------------------------------------------------------------------
examples/README.txt
(This is the README file for the examples/ folder. See docs/ for more documentation)
@ -182,7 +182,7 @@ example_empscripten:
We provide this to make the Emscripten differences obvious, and have them not pollute all other examples.
example_glfw_metal/
GLFW (Mac) + Vulkan example.
GLFW (Mac) + Metal example.
= main.mm + imgui_impl_glfw.cpp + imgui_impl_metal.mm.
example_glfw_opengl2/