Skip to content

Commit eac08cc

Browse files
committed
Merge remote-tracking branch 'upstream/develop-7.0' into develop
Conflicts: .travis.yml ide libfoundation/include/foundation.h libfoundation/src/foundation-string.cpp prebuilt/fetch-libraries.sh version
2 parents 1693a9d + cc1f053 commit eac08cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+5789
-318
lines changed

docs/notes/bugfix-13211.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-13213.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-13764.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14229.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14290.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14305.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14308.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14345.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14346.md

Lines changed: 1 addition & 0 deletions

docs/notes/bugfix-14347.md

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)