Merge branch 'master' into docking

Renamed freeglut vcxproj files + Comments, Changelog (#2465)

freeglut -> glut rename

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h

Version 1.70 WIP

Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx10/main.cpp
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx12/main.cpp
#	examples/example_win32_directx9/main.cpp

Version 1.69, comments, typos

Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_opengl3.cpp

Examples: OpenGL: Comments about versions and loaders. (#2393, #2351)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/README.txt
#	imgui.cpp

Removed trailing spaces from text files. (#2038, #2299)

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_win32.cpp

Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.

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 'master' into viewport ...

# Conflicts:
#	imgui.cpp

Comments, readme updates

Merge branch 'master' into viewport ...

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

imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873)

Merge branch 'master' into viewport ...

# Conflicts:
#	imgui.cpp

Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx

Examples: Removed old example_apple/ + tweak comments (#1873)

Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments

Merge branch 'master' into osx ...

# Conflicts:
#	examples/.gitignore
#	examples/README.txt

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp

Readme, Links, Bindings

Fixed warnings + readme

Merge branch 'master' into viewport ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_glfw.h
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_sdl.h
#	examples/imgui_impl_vulkan.h
#	examples/imgui_impl_win32.cpp

Comments, documentation

Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. (#801)