ocornut dd4ca70b0d Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp

2020-12-04 19:22:15 +01:00

..

data

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

main.cpp

Merge branch 'master' into docking

2020-10-14 14:44:03 +02:00

marmalade_example.mkb

Tables: Add empty file, skeleton.

2020-12-04 19:15:19 +01:00