Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp docking
commit 655ebe4eaff15a3996233f81885e1a3e218caab0 2 parents b892028 + 742b5f4 omar authored on 16 Apr 2019

Showing 13 changed files

• docs/CHANGELOG.txt
• examples/.gitignore
• examples/example_emscripten/Makefile
• examples/example_emscripten/main.cpp
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_dx10.cpp
• examples/imgui_impl_dx11.cpp
• examples/imgui_impl_dx12.cpp
• examples/imgui_impl_marmalade.cpp
• imgui.cpp
• imgui_demo.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/example_emscripten/Makefile

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

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

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

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below