Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui_internal.h docking
commit 0947fa3de05383c4af670c90c9c616481f43298b 2 parents f94af2f + cb9a6b8 omar authored on 21 Jan 2019

Showing 14 changed files

• docs/CHANGELOG.txt
• docs/README.md
• docs/TODO.txt
• docs/issue_template.md
• examples/README.txt
• imgui.cpp
• imgui.h
• imgui_internal.h
• imgui_widgets.cpp
• misc/README.txt
• misc/cpp/README.txt
• misc/fonts/README.txt
• misc/freetype/imgui_freetype.cpp
• misc/natvis/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 docs/issue_template.md

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/README.txt

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

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

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

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

Show line notes below