Merge git://ozlabs.org/~paulus/gitk
commit9a6c84e6e9078b0ef4fd2c50b200e8552a28c6fa
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)
tree0001140536704ecf3f0f86686fb6586cbc185ece
parent070c57df42ea4eadcc43d0456d114560124326c3
parenta8b38d95715c4bfacca7ddac67f7eb51a4cf5055
Merge git://ozlabs.org/~paulus/gitk

* git://ozlabs.org/~paulus/gitk:
  gitk: Ignore gitk-wish buildproduct
gitk-git/.gitignore
gitk-git/Makefile