Merge remote-tracking branch 'origin' into 2015-07-cleanup
commit e099798c97cb6e73e1adaa74d2ac33f3634ef14a
2 parents 4b29cc9 + 3ccbdc8
@ocornut ocornut authored on 1 Aug 2015
Showing 3 changed files
View
.gitignore 100644 → 0
View
examples/sdl_opengl_example/main.cpp
View
imgui.h