Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. (#2518)

Improved algorithm for mitre joints on thick lines

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_vulkan.cpp

Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp

InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. (#2467, #1336)

Silencing -Wstack-protector (#2459)

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h

Comments, todo list, remove trailing spaces.

Version 1.70 WIP

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp

Version 1.69, comments, typos

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp

Added GetGlyphRangesVietnamese() helper. (#2403)

Merge branch 'master' into docking ...

# Conflicts:
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp

Fix typos. (#2413)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Fix -Wconversion warning (#2379) ...

The warning was caused by implicit conversion from pointer type which
NULL has to non-pointer type, e.g. if ImTextureID is long int

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp

Internal: InputText: Comments. Renamed internal member. Renamed ImGuiStb->ImStb.

Version 1.69 WIP

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

Version 1.68

Merge branch 'master' into docking

Font: Fixed assert when specifying duplicate/overlapping ranges within a same font. (#2353, #2233)

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h

Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency. ...

Added more link to nothing's oversample document. Spacing bits.

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_widgets.cpp