omar 4ff23d3306 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h

2018-05-07 22:23:58 +02:00

..

build_win32.bat

Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.

2018-03-07 12:05:47 +01:00

directx9_example.vcxproj

…

directx9_example.vcxproj.filters

…

main.cpp

Merge branch 'master' into viewport

2018-05-07 22:23:58 +02:00