Merge remote-tracking branch 'origin/cmake-conversion'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 26 Aug 2011 15:02:51 +0000 (17:02 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 26 Aug 2011 15:02:51 +0000 (17:02 +0200)
commitc00d868f55f8e090addff01b12d72085960ba4c6
tree66b229beccf24568ce404d39d995b8aed5182faa
parenta8405184ffdfd52056ce2c1aa0e9310821880d04
parent85a1687043bb50dc1238666112b145f9afe68ef8
Merge remote-tracking branch 'origin/cmake-conversion'