mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 01:54:21 +00:00
Code Activity

Merge branch 'master' into viewport

Browse source 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
omar 2018-09-11 11:18:46 +02:00
commit df65d4a14f
10 changed files with 120 additions and 66 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.65
// dear imgui, v1.66 WIP
// (drawing and font code)
/*