Fix merge issues with the win32 library patch
authorDiane Trout <diane@caltech.edu>
Sat, 12 Aug 2006 00:39:21 +0000 (00:39 +0000)
committerDiane Trout <diane@caltech.edu>
Sat, 12 Aug 2006 00:39:21 +0000 (00:39 +0000)
commitb78cec9548432e882d98c729feb2f214023ed610
tree8ac130871fde9646ac8d2726839ab7a109f032b2
parent2e517c1bb373f0c0f11b8f78d13e8adb87be66a8
Fix merge issues with the win32 library patch
CMakeLists.txt
alg/test/CMakeLists.txt