Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl2.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_widgets.cpp docking
commit 2cada3c143c376b9afd96d19631a8d46595443fa 2 parents 4a3a895 + d16dbc5 omar authored on 11 Feb 2019

Showing 23 changed files

• docs/CHANGELOG.txt
• examples/example_apple_opengl2/main.mm
• examples/example_sdl_opengl2/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/example_sdl_vulkan/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_dx9.cpp
• examples/imgui_impl_marmalade.cpp
• examples/imgui_impl_metal.mm
• examples/imgui_impl_opengl2.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_vulkan.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_widgets.cpp
• imstb_rectpack.h
• imstb_textedit.h
• imstb_truetype.h

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/example_apple_opengl2/main.mm

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

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

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

Ignore Space Show notes View examples/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/imgui_impl_metal.mm

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

Ignore Space Show notes View imstb_rectpack.h

Ignore Space Show notes View imstb_textedit.h

Ignore Space Show notes View imstb_truetype.h

Show line notes below