Browse code Merge branch 'master' into docking # Conflicts: # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # imgui.cpp docking
commit f7db4fad3106af6d57c8580768f58ce9caaa3785 2 parents cf4fcc4 + 6767b0a omar authored on 11 Mar 2019

Showing 14 changed files

• docs/CHANGELOG.txt
• docs/TODO.txt
• examples/example_win32_directx10/main.cpp
• examples/example_win32_directx11/main.cpp
• examples/example_win32_directx12/main.cpp
• examples/example_win32_directx9/main.cpp
• examples/imgui_impl_metal.mm
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/example_win32_directx10/main.cpp

Ignore Space Show notes View examples/example_win32_directx11/main.cpp

Ignore Space Show notes View examples/example_win32_directx12/main.cpp

Ignore Space Show notes View examples/example_win32_directx9/main.cpp

Ignore Space Show notes View examples/imgui_impl_metal.mm

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_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below