You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
omar a82be53407 Merge branch 'docking2' into viewport_docking
# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
6 years ago
..
CMakeLists.txt Fix include Example_glfw_vulkan cmake (#1916) 7 years ago
build_win32.bat Examples: Renamed example folders. (#1870) 7 years ago
build_win64.bat Examples: Renamed example folders. (#1870) 7 years ago
example_glfw_vulkan.vcxproj Examples: Renamed example folders. (#1870) 7 years ago
example_glfw_vulkan.vcxproj.filters Examples: Renamed example folders. (#1870) 7 years ago
gen_spv.sh Examples: Renamed example folders. (#1870) 7 years ago
glsl_shader.frag Examples: Renamed example folders. (#1870) 7 years ago
glsl_shader.vert Examples: Renamed example folders. (#1870) 7 years ago
main.cpp Merge branch 'docking2' into viewport_docking 6 years ago