Browse code Merge branch 'master' into docking # Conflicts: # examples/README.txt # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h docking
commit 76e61958fd5bd3a5bbb82ad366e1c21685631175 2 parents 4f22a45 + d88121f omar authored on 6 May 2019

Showing 15 changed files

• docs/CHANGELOG.txt
• examples/README.txt
• examples/example_glfw_metal/Makefile
• examples/example_glfw_metal/main.mm
• examples/example_glut_opengl2/main.cpp
• examples/imgui_impl_dx10.cpp
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx9.cpp
• examples/imgui_impl_glut.cpp
• examples/imgui_impl_glut.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View examples/example_glfw_metal/Makefile 0 → 100644

Ignore Space Show notes View examples/example_glfw_metal/main.mm 0 → 100644

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

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

Ignore Space Show notes View examples/imgui_impl_glut.cpp

Ignore Space Show notes View examples/imgui_impl_glut.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_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below