Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h docking
commit 9350158d61a55ed9b7ef4208abbd8cc7469ab737 2 parents 7a51966 + 3d8ea35 omar authored on 25 Mar 2019

Showing 14 changed files

• docs/CHANGELOG.txt
• docs/README.md
• docs/TODO.txt
• examples/README.txt
• examples/imgui_impl_freeglut.cpp
• examples/imgui_impl_freeglut.h
• examples/imgui_impl_opengl3.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/fonts/README.txt

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

Ignore Space Show notes View examples/imgui_impl_freeglut.cpp

Ignore Space Show notes View examples/imgui_impl_freeglut.h

Ignore Space Show notes View examples/imgui_impl_opengl3.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/fonts/README.txt

Show line notes below