Merge branch 'jn/gitweb-dependency' into maint
commit81f90684bf879f4e149a2aeb277daf1c38fab16e
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:37:12 +0000 (16 16:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:37:12 +0000 (16 16:37 -0700)
treea7bbd5b826b52628b7f4a4aefa958bdd16fa14c8
parent2f0db1d86bb89a30c6742b03c40b320c178b1097
parentf09f1d35b5ea0637d8a3733cd246cb6bfb05b22a
Merge branch 'jn/gitweb-dependency' into maint

* jn/gitweb-dependency:
  Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
  git-instaweb: Simplify build dependency on gitweb