Skip to content

Commit

Permalink
More license updates
Browse files Browse the repository at this point in the history
  • Loading branch information
trustin committed Dec 9, 2011
1 parent d597ad7 commit f91ebb1
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
19 changes: 10 additions & 9 deletions NOTICE.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ Please visit the Netty web site for more information:


* http://netty.io/ * http://netty.io/


Copyright 2009 Red Hat, Inc. Copyright 2011 The Netty Project


Red Hat licenses this product to you under the Apache License, version 2.0 (the The Netty Project licenses this file to you under the Apache License,
"License"); you may not use this product except in compliance with the License. version 2.0 (the "License"); you may not use this file except in compliance
You may obtain a copy of the License at: with the License. You may obtain a copy of the License at:


http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0


Unless required by applicable law or agreed to in writing, software distributed Unless required by applicable law or agreed to in writing, software
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
CONDITIONS OF ANY KIND, either express or implied. See the License for the WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
specific language governing permissions and limitations under the License. License for the specific language governing permissions and limitations
under the License.


Also, please refer to each LICENSE.<component>.txt file, which is located in Also, please refer to each LICENSE.<component>.txt file, which is located in
the 'license' directory of the distribution file, for the license terms of the the 'license' directory of the distribution file, for the license terms of the
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,15 +1,15 @@
/* /*
* Copyright 2009 Red Hat, Inc. * Copyright 2011 The Netty Project
* *
* Red Hat licenses this file to you under the Apache License, version 2.0 * The Netty Project licenses this file to you under the Apache License,
* (the "License"); you may not use this file except in compliance with the * version 2.0 (the "License"); you may not use this file except in compliance
* License. You may obtain a copy of the License at: * with the License. You may obtain a copy of the License at:
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*/ */
Expand Down
12 changes: 6 additions & 6 deletions src/site/template.vm
Original file line number Original file line Diff line number Diff line change
@@ -1,15 +1,15 @@
#* #*
* Copyright 2009 Red Hat, Inc. * Copyright 2011 The Netty Project
* *
* Red Hat licenses this file to you under the Apache License, version 2.0 * The Netty Project licenses this file to you under the Apache License,
* (the "License"); you may not use this file except in compliance with the * version 2.0 (the "License"); you may not use this file except in compliance
* License. You may obtain a copy of the License at: * with the License. You may obtain a copy of the License at:
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
*# *#
Expand Down

0 comments on commit f91ebb1

Please sign in to comment.