Eliminated some problems resulting from last merge
tree46132ca85616b4614b1974673bfaabee054bf16c
-rw-r--r-- 85 CMakeLists.txt
-rw-r--r-- 35147 COPYING
-rw-r--r-- 3296 DEFINITION
-rw-r--r-- 263 TODO
drwxr-xr-x - src