Merge branch 'master' of ssh://pkgs.fedoraproject.org/znc

Conflicts:
	.gitignore
	sources
	znc.spec
This commit is contained in:
Nick Bebout 2011-02-15 18:27:30 -06:00
commit 3aff4facfe
2 changed files with 4 additions and 0 deletions

1
.gitignore vendored
View File

@ -8,4 +8,5 @@ znc-0.094.tar.gz
/znc-0.097.svn2255.tar.bz2
/znc-0.097.svn2269.tar.bz2
/znc-0.097.svn2272.tar.xz
/znc-0.097.svn2277.tar.xz
/znc-0.097.tar.xz

View File

@ -181,6 +181,9 @@ chmod -x modules/q.cpp
* Tue Feb 15 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-8.20110215git
- Update to latest git
* Wed Feb 09 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-7.svn2277
- Update to svn2277
* Mon Jan 24 2011 Nick Bebout <nb@fedoraproject.org> - 0.097-6.svn2272
- Update to svn2272