Merge branch 'dm/color-palette' into next
commit0244ef9a5c3ffe43764d4174608e773651199517
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Apr 2011 06:21:44 +0000 (4 23:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Apr 2011 06:21:44 +0000 (4 23:21 -0700)
treee187c80ef919af90b80ccbc68a4ec54939bd1be2
parentebf361263a4e1ec1e8acd9b3afb389d958ab35da
parent7cd52b5b4bf3be1f5d33fed889af186aae1ea7b8
Merge branch 'dm/color-palette' into next

* dm/color-palette:
  Share color list between graph and show-branch