Merge branch 'master' into docking ...

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

Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. (#2306, #1676) [@rasky]

ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale). ...

This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306, #1676)
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.

Window: Fixed initial width of collapsed windows not taking account of contents width (broken in 1.67). (#2336, #176)

Tabs: Fixed border (when enabled) so it is aligned correctly mid-pixel and appears as bright as other borders.

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp

ListBox/InputTextMultiline: Better optimized when clipped / non-visible.

Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. (#1086)

Added IsItemActivated() as an extension to the IsItemDeactivated/IsItemDeactivatedAfterEdit functions which are useful to implement variety of undo patterns. (#820, #956, #1875)

InputText: Fixed redo buffer exhaustion handling (rare) which could corrupt the undo character buffer. (#2333)

Merge branch 'master' of https://github.com/ocornut/imgui

Merge branch 'master' into docking ...

# Conflicts:
#	imgui_internal.h
#	imgui_widgets.cpp

Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. (#261, #351)

Update README.md

RadioButton: Fixed label horizontal alignment to precisely match Checkbox(). + Internals: Checkbox, RadioButton: Single call to ItemSize() for flow layout purpose.

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h

Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).

Removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).

Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). (#2329) [@BrutPitt]

Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp

Updating supporter list.

InputText: Fixed a bug where ESCAPE would be first captured by the Keyboard Navigation code. (#2321, #787)

InputText: Fixed a bug where ESCAPE would not restore the initial value in all situations. (#2321) [@relick]

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

Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. (#2318) [@bluescan]

Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. (#2308)

Replacing one of the third-party Python bindings. (#2312) ...

Removing the unmaintained CyImGui (only 7 commits, last one made in 2015) and replacing it with bimpy.

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).