Browse code Merge branch 'master' into viewport # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_win32.cpp # imgui_demo.cpp docking
commit e9c625a1dc91818385aea650716200e6119fa5f6 2 parents 9391a97 + 8724775 omar authored on 17 Jan 2019

Showing 14 changed files

• .editorconfig
• docs/CHANGELOG.txt
• docs/TODO.txt
• examples/example_win32_directx12/example_win32_directx12.vcxproj
• examples/imgui_impl_dx9.cpp
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_widgets.cpp
• misc/freetype/README.md
• misc/freetype/imgui_freetype.cpp
• misc/freetype/imgui_freetype.h

Ignore Space Show notes View .editorconfig 0 → 100644

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/example_win32_directx12/example_win32_directx12.vcxproj

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

Ignore Space Show notes View misc/freetype/README.md

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

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

Show line notes below