aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-03-26 06:31:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-26 06:31:37 +0000
commit79091e781b2f9e0a232d44e7dc0bb9ca1a85b60d (patch)
treeab768b5304c89ea18117168040c6a32eecf9d64f
parentf50b8b00f4d40eaaeb7e0e3a398d441d27e63d54 (diff)
parent8707775eae61c9403871f3498483eb2ab91e4598 (diff)
downloadtcpdump-79091e781b2f9e0a232d44e7dc0bb9ca1a85b60d.tar.gz
Merge "Remove redundant NOTICE copied from LICENSE." am: 5eb696acb0 am: c0095b3d2d am: 8707775eae
Change-Id: I2028c85af9ee6554eb83268fff1e826a2abf62e6
-rw-r--r--NOTICE19
1 files changed, 0 insertions, 19 deletions
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index dea5f7d5..00000000
--- a/NOTICE
+++ /dev/null
@@ -1,19 +0,0 @@
-License: BSD
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. The names of the authors may not be used to endorse or promote
- products derived from this software without specific prior
- written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.