10 Commits

Author	SHA1	Message	Date
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	2019-05-29 16:32:27 +02:00
omar	087ab2acbf	Examples: Fixed example vcproj names in Viewport branch.	2018-06-13 15:59:21 +02:00
omar	9660657e95	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	2018-06-10 15:59:35 +02:00
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
omar	77d51ebf24	Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.	2018-06-07 19:20:04 +02:00
omar	913f3692a2	Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon).	2018-02-22 22:38:22 +01:00
omar	0d063585e8	Merge branch 'jdm3_master'	2018-02-22 17:04:15 +01:00
omar	f67699456c	Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367)	2018-02-21 22:41:04 +01:00
omar	80a8aea7e3	Examples: Added SDL, Vulkan examples to .sln file.	2018-02-18 20:26:20 +01:00
omar	9e713b115f	Examples: Renamed .sln file.	2018-02-16 22:38:19 +01:00