Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp docking
commit e5f22953989cb2cf74085dccd7229d08de5c1382 2 parents 8ef0ca9 + caaa746 omar authored on 13 Aug 2018

Showing 26 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• .github/pull_request_template.md
• CHANGELOG.txt
• README.md
• TODO.txt
• examples/README.txt
• examples/example_sdl_opengl2/README.md
• examples/example_sdl_opengl3/README.md
• examples/imgui_impl_dx10.cpp
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx12.cpp
• examples/imgui_impl_dx9.cpp
• examples/imgui_impl_marmalade.cpp
• examples/imgui_impl_metal.mm
• examples/imgui_impl_opengl2.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_opengl3.h
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/fonts/binary_to_compressed_c.cpp

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View .github/pull_request_template.md

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/README.txt

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

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

Ignore Space Show notes View examples/imgui_impl_dx10.cpp

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.cpp

Ignore Space Show notes View examples/imgui_impl_dx9.cpp

Ignore Space Show notes View examples/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/imgui_impl_metal.mm

Ignore Space Show notes View examples/imgui_impl_opengl2.cpp

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_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_win32.cpp

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 misc/fonts/binary_to_compressed_c.cpp

Show line notes below