mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-02 03:40:06 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	imgui.cpp
This commit is contained in:
omar 2018-11-22 15:28:27 +01:00
commit d87b80c6c1
12 changed files with 70 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
imgui_draw.cpp
View file

@ -1,4 +1,4 @@
// dear imgui, v1.66 WIP
// dear imgui, v1.66
// (drawing and font code)
/*