Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_dx9.cpp # examples/imgui_impl_opengl3.cpp docking
commit 49fb8e6c451b53dddd0be061d9e2aaeecb27ff76 2 parents 9bf6509 + 8dab7ac omar authored on 3 Apr 2019

Showing 17 changed files

• docs/CHANGELOG.txt
• docs/TODO.txt
• examples/example_sdl_opengl2/build_win32.bat
• examples/example_sdl_opengl3/build_win32.bat
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx12.cpp
• examples/imgui_impl_dx9.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_vulkan.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/freetype/README.md

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/example_sdl_opengl2/build_win32.bat

Ignore Space Show notes View examples/example_sdl_opengl3/build_win32.bat

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_dx11.cpp

Ignore Space Show notes View examples/imgui_impl_dx12.cpp

Ignore Space Show notes View examples/imgui_impl_dx9.cpp

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

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

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

Show line notes below