Permalink
Browse files

Update main project license for .NET Foundation

  • Loading branch information...
1 parent c9cefc1 commit 81a7dbb27e9e8524cd02d8d9972ff85e825bba19 @onovotny onovotny committed Jun 16, 2016
Showing with 2 additions and 18 deletions.
  1. +2 −3 Ix.NET/Source/license.txt → LICENSE
  2. +0 −15 Rx.NET/Source/license.txt
@@ -1,6 +1,5 @@
-Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-Microsoft Open Technologies would like to thank its contributors, a list
-of whom are at http://rx.codeplex.com/wikipage?title=Contributors.
+Copyright (c) .NET Foundation and Contributors
+All Rights Reserved
Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You may
@@ -1,15 +0,0 @@
-Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-Microsoft Open Technologies would like to thank its contributors, a list
-of whom are at http://rx.codeplex.com/wikipage?title=Contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you
-may not use this file except in compliance with the License. You may
-obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-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.

0 comments on commit 81a7dbb

Please sign in to comment.