Fixed bad merge
authorChristoph Sommer <mail@christoph-sommer.de>
Sat, 3 Nov 2007 15:44:23 +0000 (15:44 +0000)
committerChristoph Sommer <mail@christoph-sommer.de>
Sat, 3 Nov 2007 15:44:23 +0000 (15:44 +0000)
commit02a8167d8a516a95ff896b821f02a5f2ad5cb63c
tree40a0d34c9261cfaacf73b94c42213861dba1d63d
parent6d9b01e8cdc3d26c6e3b3ad6f501a98e066f0273
Fixed bad merge

SVN-Revision: 5174
CMakeLists.txt