Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Revert "Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages)." ...

This reverts commit 20bc06a.

Added PushID(size_t sz) helper (may not be useful/meaningful for non C/C++ languages).

Removed trailing spaces (docking branch)

Update README.md (changed e-mail address)

Reoder Python bindings

Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. (#2109)

When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. (#1495, #822)

When resizing from an edge, the border is more visible and better follow the rounded corners. Border rendering moved to RenderOuterBorders so it can be called in a different order for docking. (#1495, #822)

Merge branch 'viewport' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/README.txt
#	imgui.cpp

Fixed range-version of PushID() and GetID() not honoring the ### operator to restart from the seed value.

Fixed using imgui_freetype.cpp in unity builds. (#2302)

Removed trailing spaces from text files. (#2038, #2299)

ImGuiTextBuffer: Added append() function (unformatted).

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_draw.cpp

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp

Fix the year for screenshot gallery part 7 and 8 links (#2298)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_win32.cpp

Qt links

Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. (#2264)

ImFontAtlas: Added 0x2000-0x206F general punctuation range to default ChineseFull/ChineseSimplifiedCommon ranges. (#2093)

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

Merge branch 'master' into viewport ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_win32.cpp
#	imgui_demo.cpp

Examples: Win32: Using IsChild() to be compatible with windows created within a parent. (#1951, #2087, #2156, #2232)

Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. (#2288, #2290)

EditorConfig: Further tweaks (#2038)

ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery] ...

+ Demo tweaks

FreeType: Minor tweaks previous commit (#2285)