Code

Merge branch 'jn/gitweb-test' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:08 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:08 +0000 (11:39 -0700)
* jn/gitweb-test:
  gitweb/Makefile: Include gitweb/config.mak
  gitweb/Makefile: Add 'test' and 'test-installed' targets
  t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
  gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

1  2 
gitweb/Makefile
gitweb/gitweb.perl
t/gitweb-lib.sh

diff --cc gitweb/Makefile
Simple merge
Simple merge
diff --cc t/gitweb-lib.sh
Simple merge