Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 60dd2217376b398ba86fb190e2f06f9010daea0b
2 parents d041ebc + bbaaab7
@ocornut ocornut authored on 8 Jul 2015
Showing 9 changed files
View
examples/README.txt
View
examples/allegro5_example/README.md 0 → 100644
View
examples/allegro5_example/imgui_impl_a5.cpp 0 → 100644
View
examples/allegro5_example/imgui_impl_a5.h 0 → 100644
View
examples/allegro5_example/main.cpp 0 → 100644
View
examples/sdl_opengl_example/README.md 0 → 100644
View
examples/sdl_opengl_example/imgui_impl_sdl.cpp
View
examples/sdl_opengl_example/imgui_impl_sdl.h
View
examples/sdl_opengl_example/main.cpp