tree 435bb414a5dd8cea235af2f7201ba89f821dad2c
parent 6994bf10bc57ff5e723a8de92ea7957d5e174568
parent ee3373d067ed253ee70087818a16b0b1210e1b8c
author omar <omarcornut@gmail.com> 1570209762 +0200
committer omar <omarcornut@gmail.com> 1570209762 +0200

Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt