1
0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-25 17:16:35 +00:00
imgui/examples/example_marmalade
omar e32256b4b4 Merge branch 'viewport' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h
2018-09-14 11:38:10 +02:00
..
data Examples: Renamed example folders. () 2018-06-10 15:42:14 +02:00
main.cpp Merge branch 'viewport' into docking 2018-09-14 11:38:10 +02:00
marmalade_example.mkb Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly () 2018-08-30 14:29:11 +02:00