Merge branch 'jn/conf'
authorJunio C Hamano <redacted>
Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)
committerJunio C Hamano <redacted>
Sun, 13 Aug 2006 02:23:09 +0000 (19:23 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge
git clone https://git.99rst.org/PROJECT