biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 846c1a8 2bb7118)
Merge release-4-5-patches into release-4-6
authorRoland Schulz <roland@utk.edu>
Fri, 18 Jan 2013 20:25:05 +0000 (15:25 -0500)
committerRoland Schulz <roland@utk.edu>
Fri, 18 Jan 2013 20:25:05 +0000 (15:25 -0500)
commit8219893f0c6fd8dcecb85f2374e5d5798a1c4b49
tree896908bfa30cfa1a0ec231fc699fb52795287208tree | snapshot
parent846c1a889268d1697e39daeb0a612eb75a149791commit | diff
parent2bb71183d411235c636ba1a2569ade2afb508779commit | diff
Merge release-4-5-patches into release-4-6

Conflicts:
src/gmxlib/confio.c (whitespace only)

286575f0cd68 commit is not needed and is ignored
by this merge.

Change-Id: I7c4aabd918384aadbf6108501023ca77e019d6c1
src/gmxlib/confio.c diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff