Merge branch '1.0'
authorAndreas Pakulat <apaku@gmx.de>
Tue, 17 Aug 2010 08:43:52 +0000 (10:43 +0200)
committerAndreas Pakulat <apaku@gmx.de>
Tue, 17 Aug 2010 08:43:52 +0000 (10:43 +0200)
commit7edde7398ec794320f5eb23bdef75945182d7d7a
treee3fcf20c887b761ff5989ff7288dae3fd781102a
parentfd8e34f99a6bda3a13eb7459fa2496a69a95a864
parent7938e805c0d376a39f55dfa29223185a8c2d9aad
Merge branch '1.0'
CMakeLists.txt