Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp # imgui_internal.h docking
commit c398153b40c81f1675ca966b81e6b85012467f90 2 parents 33994bb + 9cf94d5 omar authored on 12 Oct 2018

Showing 19 changed files

• .github/pull_request_template.md
• docs/CHANGELOG.txt
• docs/README.md
• examples/example_win32_directx10/main.cpp
• examples/example_win32_directx11/main.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_sdl.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/README.txt
• misc/cpp/imgui_stdlib.cpp
• misc/cpp/imgui_stdlib.h
• misc/natvis/README.txt
• misc/stl/imgui_stl.cpp
• misc/stl/imgui_stl.h

Ignore Space Show notes View .github/pull_request_template.md

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

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

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

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.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 imgui_widgets.cpp

Ignore Space Show notes View misc/README.txt 0 → 100644

Ignore Space Show notes View misc/cpp/imgui_stdlib.cpp 0 → 100644

Ignore Space Show notes View misc/cpp/imgui_stdlib.h 0 → 100644

Ignore Space Show notes View misc/natvis/README.txt

Show notes View misc/stl/imgui_stl.cpp 100644 → 0

Show notes View misc/stl/imgui_stl.h 100644 → 0

Show line notes below