Makefile: fix merge
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Sat, 18 May 2002 20:14:47 +0000 (15:14 -0500)
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>
Sat, 18 May 2002 20:14:47 +0000 (15:14 -0500)
commit9abb0c54e4bf6b85eaa6f4b34f4d744c3cc9f489
tree537a0eab81f4859f5910527b78b263b45998b55e
parent3e12a6dc73493f4ccde9d6d616cfa2d29d21bda7
Makefile: fix merge
Makefile