[BitchX/f17] merge master into f17 branch
Dan Mashal
vicodan at fedoraproject.org
Tue Jul 24 04:29:57 UTC 2012
commit 903a75a7ec1199afbf32d1a1ce96068587610133
Author: Dan Mashal <dan.mashal at gmail.com>
Date: Mon Jul 23 21:25:14 2012 -0700
merge master into f17 branch
sources | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index b303ba4..0fb1e6b 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
ba55d32ef69047f9884b0d69deeecdda BitchX1.2.tar.gz
-=======
-f1218676714d790538f7c2f9352d0693 BitchX1.2.tar.gz
->>>>>>> master
More information about the scm-commits
mailing list