Merge branch 'prerelease-3.2.1' into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 25 Jul 2013 08:35:26 +0000 (10:35 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Thu, 25 Jul 2013 08:35:26 +0000 (10:35 +0200)
1  2 
source/wham/src/CMakeLists.txt

Simple merge