Merge branch 'release-4-5-patches'
authorRossen Apostolov <rossen@cbr.su.se>
Wed, 25 Aug 2010 21:40:49 +0000 (23:40 +0200)
committerRossen Apostolov <rossen@cbr.su.se>
Wed, 25 Aug 2010 21:40:49 +0000 (23:40 +0200)
1  2 
include/string2.h
src/gmxlib/string2.c
src/mdlib/ns.c

Simple merge
Simple merge
diff --cc src/mdlib/ns.c
Simple merge