Browse code Merge branch 'master' into viewport # Conflicts: # examples/README.txt # imgui.cpp docking
commit cb9a6b8a8bf0174be3771357a673da0a2269542d 2 parents 2d21a64 + f14f93e 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