Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives ...

Conflicts:
	imgui.cpp

Changed SameLine() parameters from int to float.

Fixed incorrect assert triggering when code steal ActiveID move user moving window by calling e.g. SetKeyboardFocusHere()

InputText: Added ImGuiInputTextFlags_AlwaysInsertMode flag

InputText: added ImGuiInputTextFlags_NoHorizontalScroll flag. Added HasSelection() helper in ImGuiTextEditCallbackData as a clarification.

Examples: README

Allegro 5 example: removed public domain mark, MIT as the rest, with @bggd approval

Comments

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Version number 1.43 WIP ...

Bits

Disable warnings, undo f4aae6b (#265 #266)

Merge pull request #266 from Extrawurst/patch-4 ...

Fix minor clang-x64 warnings (fixes #265)

fix minor clang-x64 warnings ...

fixes #265

AA branch: Re-added PrimVtx() + PrimWriteVtx, PrimWriteIdx for finer control (#133)

New demo binaries

Version number 1.42

Allegro 5 example: converted for indexed rendering.

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Allegro 5 example: fixed uv coordinate of non-default texture.

Allegro 5 example: handling of hardware and software mouse cursor rendering.

Allegro 5 example: fixed key modifiers, keyboard input, clipping, added pagedown/pageup.

Allegro 5 example: formatting, match other example structure, fixed mouse buttons.

Allegro 5 example: main.cpp matches other examples. added window title.

SDL example: tweaks (#233 #226)

Allegro5 example: added example from https://github.com/bggd/a5imgui_example

SDL example: hasty readme.

Merge branch '2015-03-antialiased-primitives' of https://github.com/ocornut/imgui into 2015-03-antialiased-primitives

SDL example: update for indexed rendering.

Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives