fixing merge aftermath
authorMarcus Eggenberger <egs@quassel-irc.org>
Sat, 27 Sep 2008 10:48:37 +0000 (12:48 +0200)
committerMarcus Eggenberger <egs@quassel-irc.org>
Sat, 27 Sep 2008 11:47:20 +0000 (13:47 +0200)
commit3ff2a8a6d3750fc5b68af6faeece5b60e7a25f20
tree3910093cff078cbd0a982db5f4cea0cfec3c72e1
parent03d6711ea69594e8a4637b4ea20baeb9a109af9c
fixing merge aftermath
src/CMakeLists.txt