Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2011 19:23:45 +0000 (11:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jan 2011 19:23:45 +0000 (11:23 -0800)
* maint:
gitweb: skip logo in atom feed when there is none
t9001: Fix test prerequisites

1  2 
gitweb/gitweb.perl patch | diff1 | diff2 | blob | history
t/t9001-send-email.sh patch | diff1 | diff2 | blob | history
diff --cc gitweb/gitweb.perl
Simple merge
diff --cc t/t9001-send-email.sh
Simple merge