Merge branch 'cc/no-gitk-build-dependency'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:11:30 +0000 (22:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Jan 2013 06:11:30 +0000 (22:11 -0800)
Remove leftover bits from an earlier change to move gitk in its own
subdirectory.  Reimplementing the dependency tracking rules needs
to be done in gitk history separately.

* cc/no-gitk-build-dependency:
  Makefile: replace "echo 1>..." with "echo >..."
  Makefile: detect when PYTHON_PATH changes
  Makefile: remove tracking of TCLTK_PATH

1  2 
.gitignore
Makefile

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge