Merge branch 'release-4-5-patches'
authorTeemu Murtola <teemu.murtola@cbr.su.se>
Fri, 5 Nov 2010 17:53:07 +0000 (19:53 +0200)
committerTeemu Murtola <teemu.murtola@cbr.su.se>
Fri, 5 Nov 2010 17:53:07 +0000 (19:53 +0200)
commit2aace066b924b144c72f69fd4fd42bada4a0fd25
tree2d6602f337d5071ddecf6d35ec6187eb08c99a02
parent07dd8f85f7af2985ea2781b46dc0a291f8f038b9
parentc72bce9d1b3591935c95dec0673d1fa8e789232e
Merge branch 'release-4-5-patches'

Conflicts:
src/tools/Makefile.am
include/string2.h
include/vec.h
src/kernel/CMakeLists.txt
src/kernel/mdrun.c
src/tools/CMakeLists.txt
src/tools/Makefile.am