libcomps/.gitignore
Jindrich Luza 0e57505955 Merge branch 'master' into f18
Conflicts:
	.gitignore
	libcomps.spec
	sources
2013-08-14 12:00:21 +02:00

6 lines
152 B
Plaintext

/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
<<<<<<< HEAD
=======
/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
>>>>>>> master