omar c4a158656e Merge branch 'master' into viewport ... # Conflicts: # examples/allegro5_example/main.cpp # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx12_example/main.cpp # examples/directx9_example/main.cpp # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx9.cpp # examples/imgui_impl_glfw.h # examples/imgui_impl_vulkan.cpp # examples/opengl2_example/imgui_impl_glfw_gl2.cpp # examples/opengl2_example/main.cpp # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp # imgui.cpp # imgui.h		2018-03-03 23:13:31 +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
main.cpp	Examples: Renamed glfw error callback so it's more clear what it is.	2018-03-02 19:24:23 +01:00
Makefile	Do not store compiled objects outside the project tree.	2018-03-01 15:50:39 +01:00
opengl2_example.vcxproj	Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw	2018-02-18 20:26:20 +01:00
opengl2_example.vcxproj.filters	Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw	2018-02-18 20:26:20 +01:00