znc/.gitignore
Nick Bebout 5fd9362b70 Merge branch 'master' into el5
Conflicts:
	.gitignore
2010-09-24 20:31:47 -04:00

6 lines
79 B
Plaintext

<<<<<<< HEAD
znc-0.093.svn2101.tar.bz2
=======
znc-0.094.tar.gz
>>>>>>> master