Browse code Merge branch 'master_164' docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64
commit 36435b43c72f7aa9a41aba8f67827a23e7d711c2 2 parents 1c4008a + 48db571 omar authored on 31 Aug 2018

Showing 39 changed files

• CHANGELOG.txt
• README.md
• TODO.txt
• docs/CHANGELOG.txt
• docs/README.md
• docs/TODO.txt
• examples/example_allegro5/example_allegro5.vcxproj
• examples/example_allegro5/example_allegro5.vcxproj.filters
• examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj
• examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters
• examples/example_glfw_opengl2/Makefile
• examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj
• examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters
• examples/example_glfw_opengl3/Makefile
• examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj
• examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters
• examples/example_marmalade/marmalade_example.mkb
• examples/example_sdl_opengl2/Makefile
• examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj
• examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters
• examples/example_sdl_opengl3/Makefile
• examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj
• examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters
• examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj
• examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters
• examples/example_win32_directx10/example_win32_directx10.vcxproj
• examples/example_win32_directx10/example_win32_directx10.vcxproj.filters
• examples/example_win32_directx11/example_win32_directx11.vcxproj
• examples/example_win32_directx11/example_win32_directx11.vcxproj.filters
• examples/example_win32_directx12/example_win32_directx12.vcxproj
• examples/example_win32_directx12/example_win32_directx12.vcxproj.filters
• examples/example_win32_directx9/example_win32_directx9.vcxproj
• examples/example_win32_directx9/example_win32_directx9.vcxproj.filters
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp

Show notes View CHANGELOG.txt 100644 → 0

Show notes View README.md 100644 → 0

Show notes View TODO.txt 100644 → 0

Ignore Space Show notes View docs/CHANGELOG.txt 0 → 100644

Ignore Space Show notes View docs/README.md 0 → 100644

Ignore Space Show notes View docs/TODO.txt 0 → 100644

Ignore Space Show notes View examples/example_allegro5/example_allegro5.vcxproj

Ignore Space Show notes View examples/example_allegro5/example_allegro5.vcxproj.filters

Ignore Space Show notes View examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj

Ignore Space Show notes View examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters

Ignore Space Show notes View examples/example_glfw_opengl2/Makefile

Ignore Space Show notes View examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj

Ignore Space Show notes View examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters

Ignore Space Show notes View examples/example_glfw_opengl3/Makefile

Ignore Space Show notes View examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj

Ignore Space Show notes View examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters

Ignore Space Show notes View examples/example_marmalade/marmalade_example.mkb

Ignore Space Show notes View examples/example_sdl_opengl2/Makefile

Ignore Space Show notes View examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj

Ignore Space Show notes View examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters

Ignore Space Show notes View examples/example_sdl_opengl3/Makefile

Ignore Space Show notes View examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj

Ignore Space Show notes View examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters

Ignore Space Show notes View examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj

Ignore Space Show notes View examples/example_sdl_vulkan/example_sdl_vulkan.vcxproj.filters

Ignore Space Show notes View examples/example_win32_directx10/example_win32_directx10.vcxproj

Ignore Space Show notes View examples/example_win32_directx10/example_win32_directx10.vcxproj.filters

Ignore Space Show notes View examples/example_win32_directx11/example_win32_directx11.vcxproj

Ignore Space Show notes View examples/example_win32_directx11/example_win32_directx11.vcxproj.filters

Ignore Space Show notes View examples/example_win32_directx12/example_win32_directx12.vcxproj

Ignore Space Show notes View examples/example_win32_directx12/example_win32_directx12.vcxproj.filters

Ignore Space Show notes View examples/example_win32_directx9/example_win32_directx9.vcxproj

Ignore Space Show notes View examples/example_win32_directx9/example_win32_directx9.vcxproj.filters

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp 0 → 100644

Show line notes below