Skip to content

Commit

Permalink
Update LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
amirzolal committed Oct 2, 2015
1 parent 42a1a14 commit 3d4a229
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2015, amirzolal
Copyright (c) 2015, Amir Zolal
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -22,3 +22,17 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Original license for the CollisionDetection filter:
+------------------------- ORIGINAL LICENSE ------------------------------------------------------
Copyright (c) 2014, Goodwin Lawlor
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

0 comments on commit 3d4a229

Please sign in to comment.