[znc/f12/master: 35/35] Merge branch 'master' into f12
Nick Bebout
nb at fedoraproject.org
Wed Aug 11 01:03:39 UTC 2010
commit ea2c6e820c798a8321e57b3b62a0fdefc0acee3d
Merge: 14ad7f7 f95c44a
Author: Nick Bebout <nb at fedoraproject.org>
Date: Tue Aug 10 20:17:59 2010 -0400
Merge branch 'master' into f12
Conflicts:
.gitignore
sources
znc.spec
.gitignore | 2 +-
sources | 2 +-
znc.spec | 20 ++++++++++++++++----
3 files changed, 18 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 05901f4,09fc48a..080b9ee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,1 @@@
--znc-0.092.tar.gz
-znc-0.093.svn2098.tar.bz2
+ znc-0.093.svn2101.tar.bz2
More information about the scm-commits
mailing list