libcomps/.gitignore

/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
<<<<<<< HEAD
=======
/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
>>>>>>> master
Initial import (#987433). 2013-08-08 14:37:41 +00:00			`/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz`
Merge branch 'master' into f18 Conflicts: .gitignore libcomps.spec sources 2013-08-14 10:00:21 +00:00			`<<<<<<< HEAD`
			`=======`
fix #995451 2013-08-14 09:40:07 +00:00			`/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz`
Merge branch 'master' into f18 Conflicts: .gitignore libcomps.spec sources 2013-08-14 10:00:21 +00:00			`>>>>>>> master`