Merge branch '1.0'
authorAndreas Pakulat <apaku@gmx.de>
Tue, 17 Aug 2010 05:42:04 +0000 (07:42 +0200)
committerAndreas Pakulat <apaku@gmx.de>
Tue, 17 Aug 2010 05:42:04 +0000 (07:42 +0200)
commit926d50cd0207d610c3bfab88c79d64ca1eaea3e5
tree9e8bd5ebc317df59227dc3c02dece34ef27349bb
parent32d426e27a06f7e4264155afd31c630d6a2370ac
parent9bce95390a83c7f60a5e2b9159c4f245a9229e3a
Merge branch '1.0'
CMakeLists.txt