Merge branch 'master' into f14

2010-09-19 21:51:42 -04:00 · 2010-09-19 21:51:42 -04:00 · a6536a0972
commit a6536a0972
parent 5107378643 f279779f02
2 changed files with 6 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,5 @@
-git-1.7.2.1.tar.bz2
-/git-1.7.2.2.tar.bz2
-/git-1.7.2.3.tar.bz2
+*~
+*.rpm
+*.tar.bz2
+/.build*.log
+/git-*/
--- a/1
+++ b/1
@ -1 +1,2 @@
 d88c06f6442156686deb4b4fbab0954c  git-1.7.2.3.tar.bz2
+c18eb252ce63a688071f10c3f7bc28e1  git-1.7.3.tar.bz2