omar 27980d9688 Merge branch 'master' into context

2018-01-31 16:02:26 +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 'master' into context

2018-01-31 16:02:26 +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

Merge branch 'master' into context

2018-01-31 16:02:26 +01:00

Makefile

Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)

2018-01-29 00:55:16 +01:00

opengl2_example.vcxproj

Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)

2018-01-31 16:00:07 +01:00

opengl2_example.vcxproj.filters

Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)

2018-01-31 16:00:07 +01:00