Browse code Merge branch 'master' into osx # Conflicts: # examples/.gitignore # examples/README.txt 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 v1.63
commit 0d7e779b3704645ba35db83dec2bccd8438974d3 2 parents a402edb + 665bd1e omar authored on 4 Jul 2018

Showing 51 changed files

• CHANGELOG.txt
• README.md
• TODO.txt
• examples/.gitignore
• examples/README.txt
• examples/example_allegro5/README.md
• examples/example_allegro5/example_allegro5.vcxproj
• examples/example_allegro5/example_allegro5.vcxproj.filters
• examples/example_apple/imguiex.xcodeproj/project.pbxproj
• examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj
• examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters
• examples/example_freeglut_opengl2/main.cpp
• examples/example_glfw_opengl3/build_win32.bat
• examples/example_glfw_opengl3/main.cpp
• examples/example_glfw_vulkan/CMakeLists.txt
• examples/example_glfw_vulkan/main.cpp
• examples/example_sdl_opengl2/Makefile
• examples/example_sdl_opengl3/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/example_win32_directx12/main.cpp
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_allegro5.h
• examples/imgui_impl_dx10.cpp
• examples/imgui_impl_dx10.h
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx11.h
• examples/imgui_impl_dx12.cpp
• examples/imgui_impl_dx12.h
• examples/imgui_impl_dx9.cpp
• examples/imgui_impl_dx9.h
• examples/imgui_impl_freeglut.cpp
• examples/imgui_impl_freeglut.h
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glfw.h
• examples/imgui_impl_marmalade.cpp
• examples/imgui_impl_marmalade.h
• examples/imgui_impl_opengl2.cpp
• examples/imgui_impl_opengl2.h
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_opengl3.h
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_sdl.h
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_vulkan.h
• examples/imgui_impl_win32.cpp
• examples/imgui_impl_win32.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View examples/example_allegro5/README.md

Ignore Space Show notes View examples/example_allegro5/example_allegro5.vcxproj 0 → 100644

Ignore Space Show notes View examples/example_allegro5/example_allegro5.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/example_apple/imguiex.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj 0 → 100644

Ignore Space Show notes View examples/example_freeglut_opengl2/example_freeglut_opengl2.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/example_freeglut_opengl2/main.cpp 0 → 100644

Ignore Space Show notes View examples/example_glfw_opengl3/build_win32.bat

Ignore Space Show notes View examples/example_glfw_opengl3/main.cpp

Ignore Space Show notes View examples/example_glfw_vulkan/CMakeLists.txt

Ignore Space Show notes View examples/example_glfw_vulkan/main.cpp

Ignore Space Show notes View examples/example_sdl_opengl2/Makefile

Ignore Space Show notes View examples/example_sdl_opengl3/main.cpp

Ignore Space Show notes View examples/example_sdl_vulkan/main.cpp

Ignore Space Show notes View examples/example_win32_directx12/main.cpp

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_allegro5.h

Ignore Space Show notes View examples/imgui_impl_dx10.cpp

Ignore Space Show notes View examples/imgui_impl_dx10.h

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

Ignore Space Show notes View examples/imgui_impl_dx11.h

Ignore Space Show notes View examples/imgui_impl_dx12.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.h

Ignore Space Show notes View examples/imgui_impl_dx9.cpp

Ignore Space Show notes View examples/imgui_impl_dx9.h

Ignore Space Show notes View examples/imgui_impl_freeglut.cpp 0 → 100644

Ignore Space Show notes View examples/imgui_impl_freeglut.h 0 → 100644

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.h

Ignore Space Show notes View examples/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/imgui_impl_marmalade.h

Ignore Space Show notes View examples/imgui_impl_opengl2.cpp

Ignore Space Show notes View examples/imgui_impl_opengl2.h

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View examples/imgui_impl_opengl3.h

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.h

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Ignore Space Show notes View examples/imgui_impl_win32.cpp

Ignore Space Show notes View examples/imgui_impl_win32.h

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

Show line notes below