Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: apache license #7

Merged
merged 3 commits into from
Jul 2, 2024
Merged

fix: apache license #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c813752
fix: apache license
JanZachmann Jul 2, 2024
0074612
qa
JanZachmann Jul 2, 2024
b9277ea
qa
JanZachmann Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ license = "MIT OR Apache-2.0"
name = "modemmanager"
readme = "README.md"
repository = "[email protected]:omnect/modemmanager.git"
version = "0.3.0"
version = "0.3.1"

[dependencies]
num = "0.4.1"
num-derive = "0.4.1"
num-traits = "0.2.17"
zbus = "3.14"
modemmanager-sys = { git = "https://github.com/omnect/modemmanager-sys.git", features = ["zbus"], tag = "0.1.0" }
modemmanager-sys = { git = "https://github.com/omnect/modemmanager-sys.git", features = ["zbus"], tag = "0.1.2" }

[features]
ModemManager-1_20 = []
Expand Down
17 changes: 3 additions & 14 deletions LICENSE-APACHE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache License
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

Expand Down Expand Up @@ -175,18 +175,7 @@

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}
Copyright 2024 conplement AG

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -198,4 +187,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
Loading