Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h docking
commit 09c9bf2edb1742941aeb2676a8198210b529059b 2 parents b460764 + 76dbff3 omar authored on 14 Feb 2019

Showing 12 changed files

• docs/CHANGELOG.txt
• docs/README.md
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• imstb_truetype.h
• 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 examples/imgui_impl_glfw.cpp

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

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

Show line notes below