Skip to content

Commit

Permalink
Merge branch 'kdsoap-2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Jan 13, 2024
2 parents eec0822 + ae813a2 commit a14f300
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ Source: https://www.github.com/KDAB/KDSoap

#misc source code
Files: unittests/*/*.xsd unittests/*/*.wsdl unittests/*/*.XSD unittests/*/*.xml testtools/*.qrc examples/*/*.qrc examples/*/*.wsdl *.html *.css docs/manual/*.pdf *.bat *.pem
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#artwork
Files: images/*.png docs/api/*.png docs/*.png docs/*.odg examples/*/*.mng examples/*/*.gif
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#misc documentation
Files: *md *.txt *.html docs/manual/*.pdf
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#misc config files
Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .codedocs .gitignore .gitmodules .mdlrc .mdlrc.rb .pep8 .pylintrc appveyor.yml docs/api/Doxyfile.cmake distro/*
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: BSD-3-Clause

Files: kdwsdl2cpp/schemas/soapenc-1.1.xsd
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
License
=======
The KD Soap Software is Copyright 2010-2024 Klarälvdalens Datakonsult AB (KDAB),
and is available under the terms of the MIT license.
The KD Soap Software is © Klarälvdalens Datakonsult AB (KDAB), and is
available under the terms of the MIT license.

Note that this project requires the 3rd party 'libkode' submodule
that is licensed separately with LGPL-2.0-or-later; however, libkode
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Thanks to our [contributors](CONTRIBUTORS.txt).

## License

The KD Soap Software is Copyright 2010-2024, Klarälvdalens Datakonsult AB (KDAB),
and is available under the terms of the [MIT](LICENSES/MIT.txt) license.
The KD Soap Software is © Klarälvdalens Datakonsult AB (KDAB), and is
available under the terms of the [MIT](LICENSES/MIT.txt) license.

Contact KDAB at <[email protected]> for any licensing queries.

Expand Down
2 changes: 1 addition & 1 deletion docs/api/footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<hr>
<div style="float: left;">
<img src="kdab-logo-22x22.png">
<font style="font-weight: bold;">&copy; 2010-2024 Klar&auml;lvdalens Datakonsult AB (KDAB)</font>
<font style="font-weight: bold;">&copy; Klar&auml;lvdalens Datakonsult AB (KDAB)</font>
<br>
"The Qt, C++ and OpenGL Experts"<br>
<a href="https://www.kdab.com/">https://www.kdab.com/</a>
Expand Down

0 comments on commit a14f300

Please sign in to comment.