Browse code Merge branch 'master' into navigation # Conflicts: # imgui.cpp docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60
commit 8877622fa893d06114b23b513b4367e7ea290ed3 2 parents 2f15cc0 + e5a6e85 omar authored on 19 Jan 2018

Showing 18 changed files

• examples/opengl2_example/Makefile
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl2_example/imgui_impl_glfw.h
• examples/opengl2_example/imgui_impl_glfw_gl2.cpp
• examples/opengl2_example/imgui_impl_glfw_gl2.h
• examples/opengl2_example/main.cpp
• examples/opengl2_example/opengl2_example.vcxproj
• examples/opengl2_example/opengl2_example.vcxproj.filters
• examples/sdl_opengl2_example/build_win32.bat
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl.h
• examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• imgui.cpp
• imgui.h
• imgui_internal.h

Ignore Space Show notes View examples/opengl2_example/Makefile

Show notes View examples/opengl2_example/imgui_impl_glfw.cpp 100644 → 0

Show notes View examples/opengl2_example/imgui_impl_glfw.h 100644 → 0

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw_gl2.cpp 0 → 100644

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw_gl2.h 0 → 100644

Ignore Space Show notes View examples/opengl2_example/main.cpp

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj.filters

Ignore Space Show notes View examples/sdl_opengl2_example/build_win32.bat

Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.cpp 100644 → 0

Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.h 100644 → 0

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp 0 → 100644

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h 0 → 100644

Ignore Space Show notes View examples/sdl_opengl2_example/main.cpp

Ignore Space Show notes View examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Show line notes below