omar b1af4d36ce 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

2019-03-13 15:30:35 +01:00

325 KiB

Raw Blame History

View Raw