Merge branch 'pr/40'
commit 22a9555a9936f05bd0960f11f8e7bf8664e94c68
2 parents 43448d9 + 25080d5
@ocornut ocornut authored on 31 Aug 2014
Showing 3 changed files
View
imconfig.h
View
imgui.cpp
View
imgui.h