[nodejs/el6] add the new stripped tarball to sources

T.C. Hollingsworth patches at fedoraproject.org
Wed May 29 03:21:02 UTC 2013


commit 1dc8c16ff4a849aafe3525e0d621c4c2cf0cc8c1
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue May 28 20:17:30 2013 -0700

    add the new stripped tarball to sources
    
    sorry for the extra commit, `fedpkg new-sources` doesn't work with
    `git rebase --interactive` :-(
    (cherry picked from commit 9e89193903ac2693050f627bec497ed4c3d01758)
    
    Conflicts:
    	.gitignore
    	sources

 .gitignore |    5 +++++
 sources    |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f19bdd..103dbeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,8 @@
 /node-v0.10.3.tar.gz
 /node-v0.10.4.tar.gz
 /node-v0.10.5.tar.gz
+<<<<<<< HEAD
+=======
+/node-v0.10.6.tar.gz
+/node-v0.10.7-stripped.tar.gz
+>>>>>>> 9e89193... add the new stripped tarball to sources
diff --git a/sources b/sources
index 48d3be0..e27ebcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6b1c363f75185d57c8486cd63c42e14  node-v0.10.5.tar.gz
+423b68616b60db6d0277bfb7195917a7  node-v0.10.7-stripped.tar.gz


More information about the scm-commits mailing list