Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl' differently.
authorBruno Haible <bruno@clisp.org>
Mon, 21 Apr 2008 22:01:17 +0000 (00:01 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 21 Apr 2008 22:01:17 +0000 (00:01 +0200)
commit56feeb13d6ee860c4ba0a1b5020a2a9a55fe67b9
tree0c45d5faa28007c372614cb8f23345aa93a38013
parentbfca3459b4916724328bc9779cbc4e5934417c09
Fix conflict between modules 'canonicalize' and 'canonicalize-lgpl' differently.
ChangeLog
lib/canonicalize-lgpl.c
lib/canonicalize.c
modules/canonicalize-lgpl