omar 88df66ec83 Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h

2018-07-12 10:03:18 +02:00

..

build_win32.bat

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

example_glfw_opengl2.vcxproj

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

example_glfw_opengl2.vcxproj.filters

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

main.cpp

Merge branch 'master' into viewport

2018-07-12 10:03:18 +02:00

Makefile

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00