Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 5 Jun 2015 20:36:40 +0000 (23:36 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 5 Jun 2015 20:36:40 +0000 (23:36 +0300)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge