imgui

mirror of https://github.com/ocornut/imgui.git synced 2025-01-18 17:24:09 +01:00

History

omar f0364aa359 Merge branch 'context'

# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp

2018-02-06 20:16:03 +01:00

build_win32.bat

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00

imgui_impl_glfw_gl2.cpp

Merge branch 'context'

2018-02-06 20:16:03 +01:00

imgui_impl_glfw_gl2.h

Examples: Organized header files to make available features more visible.

2018-02-05 20:34:11 +01:00

main.cpp

Merge branch 'context'