Merge pull request #1078 from nem0/master ...

Added missing IMGUI_API macros in ImGuiTextEditCallbackData methods.

do not export inline function, it causes problems on some compiers

missing API

ImFont: Store the texture surface used to get an idea of how costly each font is.

ImFont: Reorder field initialization to match declaration order

Comment about ImGuiInputTextFlags_CtrlEnterForNewLine for InputTextMultiline()

Merge pull request #1068 from codecat/fix-colorbutton ...

ColorButton: fix showing wrong hex value for alpha in tooltip.

Fix ColorButton showing wrong hex value for alpha

Minor comments (#998)

Update README, kinder

Update README.md

stb_truetype update (with OpenType, Type 2 font handling) (#976)

Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917)

Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),

Comments (#972)

Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.

Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)

Comments, clarified use of io.MouseDelta (#942) ...

(ImGuiIO structure layout changed)

Update README.md

Examples: Speculative fix for OSX Makefile to make Travis happy (re #812)

Merge pull request #931 from nlguillemot/master ...

Combo, ListBox: Extra const correctness.

Minor documentation tweaks

Examples: DirectX9: Explicitely setting viewport to match that other examples are doing (#937)

Demo: comments

const correctness for Combo and ListBox ...

Since Combo and ListBox only read and display the list of items, they
should not modify the pointers inside the array of pointers passed in.
Adding "const" here makes it possible to call these functions with such
an array of const pointers. Previously, a cast to "const char**" was
required as a workaround, otherwise there was a compile error.

Renaming and massaging internal Settings/Ini functions (#923)

Fixed clicking on a window's void while staying still overzealously marking .ini settings as dirty (#923)

SliderInt, SliderFloat(): Fixed edge case where style.GrabMinSize being bigger than slider width can lead to a division by zero (#919)

SliderInt(): Fixed reverse direction mode when (v_max-v_min)==-1 (#854) (+ ref #919)

ImFileOpen: MinGW uses _wfopen() codepath to support UTF-8 filenames (#917)