Fixed conflict (CVS)
-rw-r--r-- 6229 CHANGELOG
-rw-r--r-- 1197 LICENSE
-rw-r--r-- 3275 Makefile
-rw-r--r-- 3969 README
drwxr-xr-x - asn
drwxr-xr-x - ccl
drwxr-xr-x - client
drwxr-xr-x - comstack
drwxr-xr-x - doc
-rw-r--r-- 398 header.c
drwxr-xr-x - include
drwxr-xr-x - makelib
drwxr-xr-x - odr
drwxr-xr-x - retrieval
drwxr-xr-x - rfc1006
drwxr-xr-x - server
drwxr-xr-x - tab
drwxr-xr-x - util