Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp docking
commit 13a5f5ba8baddd247256ec536940e7d4cf743a5a 2 parents 737a364 + b26ac92 omar authored on 27 Jan 2019

Showing 11 changed files

• docs/README.md
• examples/imgui_impl_dx9.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• imstb_textedit.h
• imstb_truetype.h
• misc/freetype/imgui_freetype.cpp

Ignore Space Show notes View docs/README.md

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

Ignore Space Show notes View imstb_truetype.h

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Show line notes below