Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h docking
commit 4ff23d3306dc28a37317017eebb6f6945155303b 2 parents c7687fc + 0bf43b3 omar authored on 7 May 2018

Showing 25 changed files

• CHANGELOG.txt
• README.md
• TODO.txt
• examples/allegro5_example/main.cpp
• examples/directx10_example/main.cpp
• examples/directx11_example/main.cpp
• examples/directx12_example/main.cpp
• examples/directx9_example/main.cpp
• examples/imgui_impl_dx9.cpp
• examples/marmalade_example/main.cpp
• examples/null_example/main.cpp
• examples/opengl2_example/main.cpp
• examples/opengl3_example/main.cpp
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/main.cpp
• examples/vulkan_example/main.cpp
• imconfig.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/fonts/README.txt
• misc/freetype/imgui_freetype.cpp
• stb_textedit.h

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.txt

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

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

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

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

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

Ignore Space Show notes View examples/imgui_impl_dx9.cpp

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

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

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

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

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

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

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

Ignore Space Show notes View imconfig.h

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 misc/fonts/README.txt

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Ignore Space Show notes View stb_textedit.h

Show line notes below