wordpress/.gitignore
Nick Bebout 7fa7a022ef Merge branch 'master' into f18
Conflicts:
	.gitignore
	wordpress.spec
2012-12-18 20:24:59 -06:00

39 lines
944 B
Text

<<<<<<< HEAD
=======
wordpress-3.0.1.tar.gz
/wordpress-3.0.2.tar.gz
/wordpress-3.0.3.tar.gz
/wordpress-3.0.4.tar.gz
/wordpress-3.1.tar.gz
/wordpress-3.1.1.tar.gz
/wordpress-3.1.2.tar.gz
/wordpress-3.1.3.tar.gz
/wordpress-3.2-RC1.zip
/wordpress-3.2-RC3.zip
/wordpress-3.2.tar.gz
/wordpress-3.2.1.tar.gz
/wordpress-3.3-beta2.tar.gz
/wordpress-3.3-beta3.tar.gz
/wordpress-3.3-beta4.tar.gz
/wordpress-3.3-RC1.tar.gz
/wordpress-3.3-RC2.tar.gz
/wordpress-3.3.tar.gz
/wordpress-3.3.1.tar.gz
/wordpress-3.4-beta1.tar.gz
/wordpress-3.4-beta2.tar.gz
/wordpress-3.4-beta3.tar.gz
/wordpress-3.4-beta4.tar.gz
/wordpress-3.4-RC1.tar.gz
/wordpress-3.4-RC2.tar.gz
/wordpress-3.4-RC3.tar.gz
/wordpress-3.4.tar.gz
/wordpress-3.4.1.tar.gz
/wordpress-3.4.2.tar.gz
/wordpress-3.5-beta-1.tar.gz
/wordpress-3.5-beta2.tar.gz
/wordpress-3.5-beta3.tar.gz
/wordpress-3.5-RC1.tar.gz
/wordpress-3.5-RC2.tar.gz
/wordpress-3.5-RC3.tar.gz
>>>>>>> master
/wordpress-3.5.tar.gz