Merge branch 'master' into 2015-02-colorpicker
commit c038339a4ca907b4256087ab1ed59a888b01ead0
2 parents 89b1497 + 9da53bc
@omar omar authored on 26 May 2017
Showing 14 changed files
View
README.md
View
examples/.gitignore
View
examples/sdl_opengl2_example/build_win32.bat 0 → 100644
View
examples/sdl_opengl3_example/build_win32.bat 0 → 100644
View
examples/vulkan_example/build_win32.bat
View
examples/vulkan_example/build_win64.bat 0 → 100644
View
examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
View
examples/vulkan_example/main.cpp
View
extra_fonts/README.txt
View
extra_fonts/binary_to_compressed_c.cpp
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp