Merge git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jan 2013 21:52:44 +0000 (30 13:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jan 2013 21:52:44 +0000 (30 13:52 -0800)
* git://ozlabs.org/~paulus/gitk:
  gitk: Ignore gitk-wish buildproduct

1  2 
gitk-git/.gitignore
gitk-git/Makefile

index 0000000,d7ebcaf..d7ebcaf
mode 000000,100644..100644
--- /dev/null
Simple merge