]> sjero.net Git - wget/commitdiff
Automated merge.
authorSaint Xavier <wget@sxav.eu>
Sat, 14 Jun 2008 15:46:53 +0000 (17:46 +0200)
committerSaint Xavier <wget@sxav.eu>
Sat, 14 Jun 2008 15:46:53 +0000 (17:46 +0200)
1  2 
src/init.c
src/main.c

diff --cc src/init.c
Simple merge
diff --cc src/main.c
Simple merge