aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc_src/license.hdr6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index ab2a8b38..fff8084e 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -115,9 +115,11 @@ The precise terms and conditions for copying, distribution and modification foll
----
-## License for wcslcat and wcslcpy
+## License for wcslcat and wcslcpy, and code derived from tmux
-`fish` also contains small amounts of code under the OpenBSD license, namely versions of the two functions strlcat and strlcpy, modified for use with wide character strings. This code is copyrighted by Todd C. Miller (1998). The OpenBSD license is included below.
+`fish` also contains small amounts of code under the OpenBSD license, namely versions of the two functions strlcat and strlcpy, modified for use with wide character strings. This code is copyrighted by Todd C. Miller (1998). It also contains code from [tmux](http://tmux.sourceforge.net), copyrighted by Nicholas Marriott <nicm@users.sourceforge.net> (2007), and made available under an identical license.
+
+The OpenBSD license is included below.
Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.