Merge branch 'master' into qmmm
authorGerrit Groenhof <ggroenh@ggroenh.mpibpc.intern>
Fri, 18 Jun 2010 06:42:52 +0000 (08:42 +0200)
committerGerrit Groenhof <ggroenh@ggroenh.mpibpc.intern>
Fri, 18 Jun 2010 06:42:52 +0000 (08:42 +0200)
1  2 
CMakeLists.txt
src/mdlib/qmmm.c

diff --cc CMakeLists.txt
Simple merge
Simple merge