Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Thu, 5 Mar 2015 16:52:47 +0000 (19:52 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Thu, 5 Mar 2015 16:52:47 +0000 (19:52 +0300)
commitec20fda8bb302d5cb395f0809b830db31bec63d5
tree70a5979b678e8599a6802016b0d20001ffdda894
parent1560303d837127e024f3a474e8d0a3512c8e616a
parentdb95456bb59cc7e7d61b3f2115885ccf4b5969c8
Merge branch 'master' into pygromacs
CMakeLists.txt