Merge branch '1.0'
authorAndreas Pakulat <apaku@gmx.de>
Tue, 17 Aug 2010 07:46:53 +0000 (09:46 +0200)
committerAndreas Pakulat <apaku@gmx.de>
Tue, 17 Aug 2010 07:46:53 +0000 (09:46 +0200)
commitfd8e34f99a6bda3a13eb7459fa2496a69a95a864
tree44ff06d1ee92936e431dad2ffe4dc9384e226c39
parent926d50cd0207d610c3bfab88c79d64ca1eaea3e5
parentec68a99b8f5e05315c01e39a5d585b533eddade2
Merge branch '1.0'
CMakeLists.txt