Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h docking
commit 5af930f97a17d611c14c7afe7c51d006aaff256c 2 parents e1ed27a + 1ae7f88 omar authored on 7 Jan 2019

Showing 20 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• .github/pull_request_template.md
• docs/CHANGELOG.txt
• docs/README.md
• docs/TODO.txt
• docs/issue_template.md
• docs/pull_request_template.md
• examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
• examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_metal.mm
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/fonts/README.txt
• misc/natvis/imgui.natvis

Show notes View .github/CONTRIBUTING.md 100644 → 0

Show notes View .github/issue_template.md 100644 → 0

Show notes View .github/pull_request_template.md 100644 → 0

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View docs/TODO.txt

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

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

Ignore Space Show notes View examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_metal.mm

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

Ignore Space Show notes View misc/natvis/imgui.natvis

Show line notes below