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 575df6f192 Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h		5 years ago
..
CMakeLists.txt	…
build_win32.bat	…
build_win64.bat	…
example_glfw_vulkan.vcxproj	Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.	6 years ago
example_glfw_vulkan.vcxproj.filters	…
gen_spv.sh	…
glsl_shader.frag	…
glsl_shader.vert	…
main.cpp	Merge branch 'master' into docking	5 years ago