omar 6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel ...

# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp

2018-01-20 12:06:06 +01:00

..

build_win32.bat

Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)

2016-08-25 10:25:51 +02:00

imgui_impl_glfw_gl2.cpp

Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel

2018-01-20 12:06:06 +01:00

imgui_impl_glfw_gl2.h

Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.

2018-01-19 09:50:58 +01:00

main.cpp

Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.

2018-01-19 09:50:58 +01:00

Makefile

Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.

2018-01-19 09:50:58 +01:00

opengl2_example.vcxproj

Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.

2018-01-19 09:50:58 +01:00

opengl2_example.vcxproj.filters

Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.

2018-01-19 09:50:58 +01:00