Removed git merge leftovers

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
#	imgui.cpp

Internals: SettingsHandlerWindow_ReadLine uses context parameter.

Examples: Added missing per-renderer local changelogs. (#2037, #1639, #2452)

ImDrawCallback_ResetRenderState: Added Metal.

ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)

Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.

Drag and Drop: Fixed drag source with ImGuiDragDropFlags_SourceAllowNullID and null ID from receiving click regardless of being covered by another window (it didn't honor correct hovering rules). (#2521)

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

Tidying up BeginMenu() code + comments.

Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's ae76a1fd).

Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517) ...

Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.

Internals: Added DataTypeApplyOp, DataTypeApplyOpFromText to imgui_internal.h

Fix 61d9258 when there is not scrollbar "Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active."

Internals: Renaming. Renamed ImGuiPopupRef to ImGuiPopupData for consistency and added constructor.

Internals: Exposed ImGuiDataTypeInfo, DataTypeGetInfo(), DataTypeFormatString(). Comments.

Internals: Begin: Moved OuterRectClipped/InnerMainRect/InnerClipRect computation higher up in the function, next to ContentsRect/WorkRect code. Removed commented out debug drawing code which is now available in Metrics window.

Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active.

Internals: Nav scrolling uses InnerMainRect instead of InnerClipRect.

Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.

Examples: Emscripten: Fixed not enabling Docking and Nav by default. (#2494)

Merge branch 'master' into docking ...

# Conflicts:
#	examples/example_sdl_opengl2/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	imgui.cpp

Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.

Internals: TempInputText: Tidying up DragScalar / SliderScalar / TempInputTextScalar.

Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.

Internals: Using more explicit PushOverrideID() helper + renamed equivalent internal tree helper.

Examples: Glut: Added note about missing cursor support. (#2375, #2465)

Window: Fixed window with the AlwaysAutoResize flag unnecessarily extending their hovering boundaries by a few pixels (this is used to facilitate resizing from borders when available for a given window). One of the noticeable minor side effect was that navigating menus would have had a tendency to disable highlight from parent menu items earlier than necessary while approaching the child menu. ...

+ Changelog fixed unfinished sentence and tweaks,