ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.

Removed tabs that slipped through the cracks

Columns: Caching columns clipping rectangles (#125)

Columns: Moved PushColumnClipRect() to imgui_internal.h

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: 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

ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)

ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)

ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)

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

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

TODO list update, comments

Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS

Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)

Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&

Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.

Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.

Comments about parts of imgui_internal.h that will self-destruct.

ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)

ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code (#346)

ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. (#346)

RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346)

ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( (#346) + comments

ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)

ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)

ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h (#346)

Merge branch 'master' into 2016-02-colorpicker

Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) (#862)