Skip to content

Commit 4a30b68

Browse files
committed
Auto merge of #1846 - RalfJung:license, r=RalfJung
sync license files with rustc repo `@Mark-Simulacrum` pointed out that our license files are slightly different from those in rustc. This syncs them. The question is... is this a thing we can just do?^^
2 parents 74f81e9 + ca782df commit 4a30b68

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

LICENSE-APACHE

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -174,28 +174,3 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
174174
of your accepting any such warranty or additional liability.
175175

176176
END OF TERMS AND CONDITIONS
177-
178-
APPENDIX: How to apply the Apache License to your work.
179-
180-
To apply the Apache License to your work, attach the following
181-
boilerplate notice, with the fields enclosed by brackets "[]"
182-
replaced with your own identifying information. (Don't include
183-
the brackets!) The text should be enclosed in the appropriate
184-
comment syntax for the file format. We also recommend that a
185-
file or class name and description of purpose be included on the
186-
same "printed page" as the copyright notice for easier
187-
identification within third-party archives.
188-
189-
Copyright 2016 The Miri Developers
190-
191-
Licensed under the Apache License, Version 2.0 (the "License");
192-
you may not use this file except in compliance with the License.
193-
You may obtain a copy of the License at
194-
195-
http://www.apache.org/licenses/LICENSE-2.0
196-
197-
Unless required by applicable law or agreed to in writing, software
198-
distributed under the License is distributed on an "AS IS" BASIS,
199-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200-
See the License for the specific language governing permissions and
201-
limitations under the License.

LICENSE-MIT

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Copyright (c) 2016 The Miri Developers
2-
31
Permission is hereby granted, free of charge, to any
42
person obtaining a copy of this software and associated
53
documentation files (the "Software"), to deal in the

0 commit comments

Comments
 (0)