Merge branch 'viewport' into docking
# Conflicts:
#	docs/CHANGELOG.txt
commit b5144e477f1ea627c0fa1a4c33df93c88443e89d
2 parents d1851ed + e9c625a
@omar omar authored on 17 Jan 2019
Showing 13 changed files
View
.editorconfig 0 → 100644
View
docs/CHANGELOG.txt
View
docs/TODO.txt
View
examples/example_win32_directx12/example_win32_directx12.vcxproj
View
examples/imgui_impl_dx9.cpp
View
examples/imgui_impl_win32.cpp
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
misc/freetype/README.md
View
misc/freetype/imgui_freetype.cpp
View
misc/freetype/imgui_freetype.h