ocornut 7e246a7bb9 Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h		2023-09-16 13:51:51 +02:00
..
example_glut_opengl2.vcxproj	Examples: Updated all Visual Studio project file to use /utf-8 option, so string literals are UTF-8 encoded by default.	2023-05-10 12:34:11 +02:00
example_glut_opengl2.vcxproj.filters	Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)	2023-03-15 17:09:09 +01:00
main.cpp	Merge branch 'master' into docking	2023-09-16 13:51:51 +02:00
Makefile	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00