ocornut 6b3435a2db Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl3.cpp # docs/CHANGELOG.txt		2023-03-16 12:01:13 +01:00
..
build_win32.bat	Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445)	2021-08-19 16:24:59 +02:00
example_glfw_opengl3.vcxproj	Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)	2023-03-15 17:09:09 +01:00
example_glfw_opengl3.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-03-10 18:40:04 +01:00
Makefile	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00
Makefile.emscripten	Examples: Made example_sdl_opengl3 and example_glfw_opengl3 build with Emscripten. Removed dedicated examples. (#2492, #2494, #3699, #3705)	2023-02-02 18:08:17 +01:00