Browse code Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives 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 v1.53 v1.52 v1.51 v1.50 v1.49 v1.48 v1.47 v1.46 v1.45 v1.44 v1.43
commit ea720963cfb8807537eecc8cce6c4c24ff970d07 2 parents 378eee4 + d3e444d ocornut authored on 16 Mar 2015

Showing 33 changed files

• examples/directx11_example/directx11_example.vcxproj
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx11_example/main.cpp
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/directx9_example/main.cpp
• examples/imgui_examples_msvc2010.sln
• examples/libs/gl3w/GL/gl3w.c
• examples/libs/gl3w/GL/gl3w.h
• examples/libs/gl3w/GL/glcorearb.h
• examples/libs/glfw/COPYING.txt
• examples/libs/glfw/include/GLFW/glfw3.h
• examples/libs/glfw/include/GLFW/glfw3native.h
• examples/libs/glfw/lib-vc2010-32/glfw3.lib
• examples/libs/glfw/lib-vc2010-64/glfw3.lib
• examples/opengl3_example/Makefile
• examples/opengl3_example/gl3w/GL/gl3w.c
• examples/opengl3_example/gl3w/GL/gl3w.h
• examples/opengl3_example/gl3w/GL/glcorearb.h
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/main.cpp
• examples/opengl3_example/opengl3_example.vcxproj
• examples/opengl3_example/opengl3_example.vcxproj.filters
• examples/opengl_example/glfw/COPYING.txt
• examples/opengl_example/glfw/include/GLFW/glfw3.h
• examples/opengl_example/glfw/include/GLFW/glfw3native.h
• examples/opengl_example/glfw/lib-msvc100/glfw3.lib
• examples/opengl_example/glfw/lib-msvc110/glfw3.lib
• examples/opengl_example/imgui_impl_glfw.cpp
• examples/opengl_example/main.cpp
• examples/opengl_example/opengl_example.vcxproj
• imgui.cpp
• imgui.h

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

Ignore Space Show notes View examples/directx11_example/imgui_impl_dx11.cpp

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

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

Ignore Space Show notes View examples/directx9_example/imgui_impl_dx9.cpp

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

Ignore Space Show notes View examples/imgui_examples_msvc2010.sln

Ignore Space Show notes View examples/libs/gl3w/GL/gl3w.c 0 → 100644

Ignore Space Show notes View examples/libs/gl3w/GL/gl3w.h 0 → 100644

Ignore Space Show notes View examples/libs/gl3w/GL/glcorearb.h 0 → 100644

Ignore Space Show notes View examples/libs/glfw/COPYING.txt 0 → 100644

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3.h 0 → 100644

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3native.h 0 → 100644

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-32/glfw3.lib 0 → 100644
Not supported

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-64/glfw3.lib 0 → 100644
Not supported

Ignore Space Show notes View examples/opengl3_example/Makefile

Show notes View examples/opengl3_example/gl3w/GL/gl3w.c 100644 → 0

Show notes View examples/opengl3_example/gl3w/GL/gl3w.h 100644 → 0

Show notes View examples/opengl3_example/gl3w/GL/glcorearb.h 100644 → 0

Ignore Space Show notes View examples/opengl3_example/imgui_impl_glfw_gl3.cpp

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

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

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

Show notes View examples/opengl_example/glfw/COPYING.txt 100644 → 0

Show notes View examples/opengl_example/glfw/include/GLFW/glfw3.h 100644 → 0

Show notes View examples/opengl_example/glfw/include/GLFW/glfw3native.h 100644 → 0

Show notes View examples/opengl_example/glfw/lib-msvc100/glfw3.lib 100644 → 0
Not supported

Show notes View examples/opengl_example/glfw/lib-msvc110/glfw3.lib 100644 → 0
Not supported

Ignore Space Show notes View examples/opengl_example/imgui_impl_glfw.cpp

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

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

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Show line notes below