Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/README.txt # imgui.cpp # imgui.h # imgui_internal.h # imgui_widgets.cpp docking
commit d3d998a885f7a5bbadc5af47b36ea5570af4b742 2 parents 5f409c6 + 2da1c66 omar authored on 12 Jun 2019

Showing 19 changed files

• docs/CHANGELOG.txt
• docs/README.md
• examples/README.txt
• examples/example_allegro5/README.md
• examples/example_glfw_vulkan/CMakeLists.txt
• examples/example_glut_opengl2/main.cpp
• examples/example_null/main.cpp
• examples/imgui_impl_glut.cpp
• examples/imgui_impl_glut.h
• imconfig.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/cpp/README.txt
• misc/fonts/README.txt
• misc/freetype/README.md

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

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_glfw_vulkan/CMakeLists.txt

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

Ignore Space Show notes View examples/example_null/main.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 imconfig.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

Ignore Space Show notes View imgui_widgets.cpp

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

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

Ignore Space Show notes View misc/freetype/README.md

Show line notes below