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 viewport

Browse source 
# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
This commit is contained in:
omar 2018-12-04 00:02:11 +01:00
commit 3a678d48b1
10 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui_widgets.cpp
View file

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