From: Junio C Hamano <junkio@cox.net>
Date: Wed, 21 Sep 2005 07:58:32 +0000 (-0700)
Subject: Clarify dual license status of subprocess.py file.
X-Git-Tag: v0.99.8~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=28ad81f58ea25b915a400dab908f93373f9f63de;p=git.git

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)
---

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