Merge branch 'viewport' into docking ...

# Conflicts:
#	imgui.cpp

Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.

Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_marmalade/main.cpp

Merge branch 'master' into viewport + specific changes for GLFW callbacks ...

# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_glfw.cpp

Examples: Misc comments mainly related to GLFW callbacks. (#1759)

Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)

Merge branch 'viewport' into docking

Examples: SDL: Tweaked Windows instructions and batch files. (#2175)

Examples: SDL: Tweaked Windows instructions and batch files. (#2175)

Viewport: Enabled viewports by default in more example apps.

Merge branch 'viewport' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp

Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.

Merge branch 'docking2' into viewport_docking ...

# Conflicts:
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h

Examples: Enabled Docking + Nav by default in the branch. (#351)

Merge branch 'master' into viewport

Examples: imgui_impl_opengl3 Fix GLAD error condition (#2059, #2002) ...

`gladLoadGL` returns 0 on fail, not the other way around.

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h

Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. (#2001, #2002). Changelog, tweaks, applied changes to SDL+OpenGL3 example.

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp

Examples: Fix 'How to build' instructions for SDL2 examples (#2012)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp

Examples: Using fully qualified "Dear ImGui" name in window titles.

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx11.cpp
#	imgui_demo.cpp

Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_draw.cpp
#	imgui_internal.h

Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. (#1938, #1900, #1513, #1466, etc.)

Merge branch 'master' into viewport ...

# Conflicts:
#	imgui.cpp