Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit b974fffea033149ffe53b4107f632b4ebb95b708 2 parents a2616c7 + e0cab56 omar authored on 6 Sep 2018

Showing 14 changed files

• docs/CHANGELOG.txt
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• imstb_rectpack.h
• imstb_textedit.h
• imstb_truetype.h
• misc/freetype/imgui_freetype.cpp
• stb_rect_pack.h
• stb_textedit.h
• stb_truetype.h

Ignore Space Show notes View docs/CHANGELOG.txt

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_rectpack.h 0 → 100644

Ignore Space Show notes View imstb_textedit.h 0 → 100644

Ignore Space Show notes View imstb_truetype.h 0 → 100644

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

Show notes View stb_rect_pack.h 100644 → 0

Show notes View stb_textedit.h 100644 → 0

Show notes View stb_truetype.h 100644 → 0

Show line notes below