aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-21 00:58:32 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-21 01:11:32 -0700
commit28ad81f58ea25b915a400dab908f93373f9f63de (patch)
tree97656493531ae2b347ba9bc7833f54227d32eb6f
parent6f60300b5408323f6b73b471b45e539fa49a6a76 (diff)
downloadgit-28ad81f58ea25b915a400dab908f93373f9f63de.tar.gz
git-28ad81f58ea25b915a400dab908f93373f9f63de.tar.xz
Clarify dual license status of subprocess.py file.
The author of the file we stole from Python 2.4 distribution, Peter Astrand <astrand@lysator.liu.se>, OK'ed to add this at the end of the licensing terms section of the file: Use of this file within git is permitted under GPLv2. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 089f20dce19711d34f5383ee289a9b1fbd3f3307 commit)
-rw-r--r--compat/subprocess.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/compat/subprocess.py b/compat/subprocess.py
index d115e87cc..93323dfc0 100644
--- a/compat/subprocess.py
+++ b/compat/subprocess.py
@@ -24,6 +24,9 @@
# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Use of this file within git is permitted under GPLv2.
+#
r"""subprocess - Subprocesses with accessible I/O streams