Browse code Merge upstream 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 91684a428bfc7efc95a7ae77020ca6f89c7d9178 2 parents d9757bb + 98a38e2 Mikko Mononen authored on 6 Jan 2015

Showing 29 changed files

• .gitignore
• .travis.yml
• README.md
• examples/directx11_example/directx11_example.vcxproj
• examples/directx11_example/directx11_example.vcxproj.filters
• examples/directx11_example/main.cpp
• examples/directx9_example/directx9_example.sln
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/directx9_example.vcxproj.filters
• examples/directx9_example/main.cpp
• examples/imgui_examples_msvc2010.sln
• examples/opengl3_example/Makefile
• examples/opengl3_example/main.cpp
• examples/opengl3_example/opengl3_example.vcxproj
• examples/opengl3_example/opengl3_example.vcxproj.filters
• examples/opengl_example/Makefile
• examples/opengl_example/main.cpp
• examples/opengl_example/opengl_example.sln
• examples/opengl_example/opengl_example.vcxproj
• examples/opengl_example/opengl_example.vcxproj.filters
• examples/opengl_example/stb_image.h
• examples/shared/README.txt
• examples/shared/stb_image.h
• extra_fonts/proggy_clean_13.fnt
• extra_fonts/proggy_clean_13.png
• imconfig.h
• imgui.cpp
• imgui.h
• stb_textedit.h

Ignore Space Show notes View .gitignore

Ignore Space Show notes View .travis.yml 0 → 100644

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj 0 → 100644

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/directx11_example/main.cpp 0 → 100644

Show notes View examples/directx9_example/directx9_example.sln 100644 → 0

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

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

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

Ignore Space Show notes View examples/imgui_examples_msvc2010.sln 0 → 100644

Ignore Space Show notes View examples/opengl3_example/Makefile 0 → 100644

Ignore Space Show notes View examples/opengl3_example/main.cpp 0 → 100644

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj 0 → 100644

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj.filters 0 → 100644

Ignore Space Show notes View examples/opengl_example/Makefile

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

Show notes View examples/opengl_example/opengl_example.sln 100644 → 0

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

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

Show notes View examples/opengl_example/stb_image.h 100644 → 0

Ignore Space Show notes View examples/shared/README.txt 0 → 100644

Ignore Space Show notes View examples/shared/stb_image.h 0 → 100644

Ignore Space Show notes View extra_fonts/proggy_clean_13.fnt
Not supported

Ignore Space Show notes View extra_fonts/proggy_clean_13.png

Ignore Space Show notes View imconfig.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View stb_textedit.h

Show line notes below