| commit | e0c0e53edfa892f7ec834dac7cce1a63bac18fea | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Fri Oct 04 19:22:42 2019 +0200 |
| committer | omar <omarcornut@gmail.com> | Fri Oct 04 19:22:42 2019 +0200 |
| tree | 435bb414a5dd8cea235af2f7201ba89f821dad2c | |
| parent | 6994bf10bc57ff5e723a8de92ea7957d5e174568 [diff] | |
| parent | ee3373d067ed253ee70087818a16b0b1210e1b8c [diff] |
Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt