torque/.gitignore
David Brown 26c96b6a60 Merge branch 'master' into el6
Conflicts:
	.gitignore
	sources
	torque-munge-size.patch
	torque.spec
2014-10-14 22:49:41 -07:00

17 lines
329 B
Plaintext

/torque-2.5.2.tar.gz
/torque-2.5.3.tar.gz
<<<<<<< HEAD
/torque-2.5.4.tar.gz
/torque-2.5.5.tar.gz
/torque-2.5.7.tar.gz
=======
/torque-3.0.0.tar.gz
/torque-3.0.0-snap.201102011355.tar.gz
/torque-3.0.1.tar.gz
/torque-3.0.2.tar.gz
/torque-3.0.3.tar.gz
/torque-3.0.4.tar.gz
/torque-4.2.6.1.tar.gz
/torque-4.2.8.tar.gz
>>>>>>> master