Merge branch 'jn/conf'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)
commit86183fb...09ffe5d46eae1cf52023a1b5f8fbc047
treec3e9476...b5baa12f84020efe130291275ee01aefcopy hash to clipboard (tree)
parentcd5fff6...e6014f9c1d4c2bc113fde19bd45d2db7copy hash to clipboard (diff)
parenta20b4d8...9ae75e075641d7bfe9462a239c8b9236copy hash to clipboard (diff)
Makefile