Internals: Moved CalcItemSize next to CalcItemWidth, added comments to clarify their respective intent. Should have no side effect.

Combo, Slider: Improve rendering in situation when there's there's very little space available.

Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows. ...

Renamed SameLine() first parameter.

Columns: Fixed boundary of clipping being off by 1 pixel within the left column.

emscripten: replace shell_minimal.html with 'soft fullscreen' version

Clarified asserts comments + todo entries. (#2500)

Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.

Merged a bunch of small changes from Docking branch to reduce the difference between branches. ...

Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.

Internals: Columns: Some renaming, extracted code into GetColumnsID().

Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)

Examples: Emscripten: Tweaks for size. (#2494)

Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.

Examples: Emscripten: Fixed error in shell template. (#2494)

Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)

Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)

Merge branch 'standalone-emscripten' of https://github.com/nicolasnoble/imgui

Adding standalone Emscripten example.

Internals: Moved resize grips and borders to nav layer 1 so that testing system doesn't attempt to scroll to get them inside the InnerRect.

Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.

PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)

Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)

Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.

Demo: Comments, tweaks, removed some uses of ImColor helpers.

Examples: Null: Added Makefile.

Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684, #2341)

Internals: Tweak ItemSize calls. Added todo items.

Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297)

Examples: Vulkan: Fixed warnings. (#2480)

Merge branch 'vulkan_fix_master'

FAQ tweaks. Add missing entries in imgui.cpp (which until now where only in the README).