]> git.neil.brown.name Git - history.git/commitdiff
Merge
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Mon, 28 Oct 2002 07:00:46 +0000 (01:00 -0600)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Mon, 28 Oct 2002 07:00:46 +0000 (01:00 -0600)
1  2 
Makefile

diff --cc Makefile
Simple merge