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

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
This commit is contained in:
ocornut
2020-12-04 19:22:15 +01:00
parent 657589ab47 9874077fc0
commit dd4ca70b0d
49 changed files with 6384 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/example_marmalade/marmalade_example.mkb
View File

@ -33,6 +33,7 @@ files
../../imgui.cpp
../../imgui_demo.cpp
../../imgui_draw.cpp
../../imgui_tables.cpp
../../imgui_widgets.cpp
../../imconfig.h
../../imgui.h