Merge branch 'zapolnov-master'
commit 76ce08c338c385c2c71b1e72c7d46b777c6594e7
2 parents d45044f + b816d05
@ocornut ocornut authored on 2 Mar 2016
Showing 4 changed files
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_internal.h