omar
|
2cbc0f1287
|
Restore SLN which in Docking branch includes more projects.
|
6 years ago |
|
omar
|
8dc04a4c9f
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.h
# imgui_demo.cpp
|
6 years ago |
|
omar
|
087ab2acbf
|
Examples: Fixed example vcproj names in Viewport branch.
|
7 years ago |
|
omar
|
9660657e95
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
7 years ago |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
7 years ago |
|
omar
|
77d51ebf24
|
Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.
|
7 years ago |
|
omar
|
913f3692a2
|
Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon).
|
7 years ago |
|
omar
|
0d063585e8
|
Merge branch 'jdm3_master'
|
7 years ago |
|
omar
|
f67699456c
|
Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367)
|
7 years ago |
|
omar
|
80a8aea7e3
|
Examples: Added SDL, Vulkan examples to .sln file.
|
7 years ago |
|
omar
|
9e713b115f
|
Examples: Renamed .sln file.
|
7 years ago |