Skip to content

Commit

Permalink
fix licenses
Browse files Browse the repository at this point in the history
  • Loading branch information
aarondav committed Jul 21, 2014
1 parent 5c0efaf commit a7b5b1c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
20 changes: 19 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ Written by Pavel Binko, Dino Ferrero Merlino, Wolfgang Hoschek, Tony Johnson, An


========================================================================
Fo SnapTree:
For SnapTree:
========================================================================

SNAPTREE LICENSE
Expand Down Expand Up @@ -482,6 +482,24 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.


========================================================================
For Timsort:
========================================================================
Copyright (C) 2008 The Android Open Source Project

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.


========================================================================
BSD-style licenses
========================================================================
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
/*
* Copyright (C) 2008 The Android Open Source Project
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
Expand Down

0 comments on commit a7b5b1c

Please sign in to comment.