Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913)

Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125)

Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125)

Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af2. (#913, #125). End() calls EndColumns() directly.

Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913, #125)

Columns: Fixed EndColumns() not repositioning the cursor. (#913)

Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)

Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master ...

# Conflicts:
#	imgui.cpp
#	imgui.h

Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.

Added GetStyleColorVec4()

GCC warnings fixes

Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.

Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)

Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME

OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.

PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747)

(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.

Undo part of 32dbe83 to keep the same name for both overloads (#891, #799)

Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open ...

# Conflicts:
#	imgui.cpp

BeginPopupEx() uses ImGuiID internally

PlotHistogram: bars are drawn based on the position of zero (#828)

Comments (#1034)

Moved TODO list to TODO.txt

Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (#1048, #1056)

Style: Tweaked default border (which is off by default) to be less noticeable (#707, #1019)

Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019)

PathArcToFast: Minor renaming for clarification. Comments.

Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)

Fix broken ImGuiColorEditFlags_NoAlpha flag check ...

* Fixes warning:
  imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]

Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks