Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl2.h # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # imgui.cpp # imgui.h docking
commit 70b0bd13aa9f34b24ffce14ccdd19cfc05578746 2 parents 087ab2a + b5d3858 omar authored on 14 Jun 2018

Showing 15 changed files

• CHANGELOG.txt
• examples/.gitignore
• examples/example_allegro5/README.md
• examples/example_allegro5/example_allegro5.vcxproj
• examples/example_allegro5/example_allegro5.vcxproj.filters
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_opengl2.cpp
• examples/imgui_impl_opengl2.h
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_opengl3.h
• examples/imgui_impl_sdl.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View examples/.gitignore

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

Ignore Space Show notes View examples/example_allegro5/example_allegro5.vcxproj 0 → 100644

Ignore Space Show notes View examples/example_allegro5/example_allegro5.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_opengl2.cpp

Ignore Space Show notes View examples/imgui_impl_opengl2.h

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_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_internal.h

Show line notes below