4 Commits (a0c2e55e8c25eaf119a7e80fb4cc43c257a83a97)

Author SHA1 Message Date
omar b85f345369 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
7 years ago
omar 1afd29d382 Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo. 7 years ago
omar 6277781e83 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
7 years ago
Warren Moore d64157e803 Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873) 7 years ago