Skip to content

Commit 9267a31

Browse files
mulle-natmulle-nat
committed
Merge: resolve LICENSE conflict and update sourcetree config
2 parents 102d4e1 + 394956f commit 9267a31

File tree

21 files changed

+553
-44
lines changed

21 files changed

+553
-44
lines changed

‎.mulle/etc/env/environment-host-ci-prerelease.sh‎

Lines changed: 144 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/etc/sourcetree/config‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/share/howto/debug.md‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/share/howto/dependency.md‎

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/share/howto/testing.md‎

Lines changed: 85 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/share/sde/version/mulle-c/c‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/share/sde/version/mulle-c/c-cmake‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.mulle/share/sde/version/mulle-c/c-demo‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2023, mulle-c
3+
Copyright (c) 2026, mulle-core
44

55
Redistribution and use in source and binary forms, with or without
66
modification, are permitted provided that the following conditions are met:

‎RELEASENOTES.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.1.0
2+
3+
Various small improvements

0 commit comments

Comments
 (0)