Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master
Conflicts:
	imgui.cpp
commit e36fad65dda0cfbeed0eceea2a0a6fee6ee9cf88
2 parents 4e33787 + 087ded0
@ocornut ocornut authored on 4 Feb 2015
Showing 2 changed files
View
imgui.cpp
View
imgui.h