Merge branch 'master' into qmmm
authorGerrit Groenhof <ggroenh@ggroenh.mpibpc.intern>
Wed, 9 Jun 2010 07:57:21 +0000 (09:57 +0200)
committerGerrit Groenhof <ggroenh@ggroenh.mpibpc.intern>
Wed, 9 Jun 2010 07:57:21 +0000 (09:57 +0200)
commitd8337d445f64d536970654bfda52cdbb6c0b97e8
tree4e77a7fbaef44432d96537bc913a5ac39c9d9b9a
parent88b2a55752c5d5735c6555c115f462ec810228cb
parent0aef477d7343703a93f76e0296722b5ceb253531
Merge branch 'master' into qmmm

Conflicts:

configure.ac
src/mdlib/Makefile.am
CMakeLists.txt
configure.ac
include/types/qmmmrec.h
src/mdlib/Makefile.am
src/mdlib/qmmm.c