sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to stable-0.46 grimoire by George Sherwood (0290ded213ea0ee2b744660ca2a8ec80a8a78abc)
- From: George Sherwood <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to stable-0.46 grimoire by George Sherwood (0290ded213ea0ee2b744660ca2a8ec80a8a78abc)
- Date: Fri, 23 Jul 2010 06:04:25 -0500
GIT changes to stable-0.46 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:
http/firefox/DETAILS | 4 ----
1 files changed, 4 deletions(-)
New commits:
commit 0290ded213ea0ee2b744660ca2a8ec80a8a78abc
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
firefox: Clean up merge
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 443665f..8a27cc8 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -19,10 +19,6 @@ else
SOURCE2_URL[0]=$SOURCE_URL.asc
SECURITY_PATCH=33
fi
-<<<<<<< HEAD
-=======
- PATCHLEVEL=0
->>>>>>> 6b7cb26... firefox 3.6.7, SECURITY_PATCH=33
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.mozilla.org/projects/firefox/
- [SM-Commit] GIT changes to stable-0.46 grimoire by George Sherwood (0290ded213ea0ee2b744660ca2a8ec80a8a78abc), George Sherwood, 07/23/2010
Archive powered by MHonArc 2.6.24.