Resolved merge conflict in gmx_membed.c
authorErik Lindahl <lindahl@cbr.su.se>
Fri, 27 Aug 2010 18:02:36 +0000 (20:02 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Fri, 27 Aug 2010 18:02:36 +0000 (20:02 +0200)
commit5777eae9a4eff22386f4f5263b0d5f1c1769e4da
tree0a7d53568b14f9658b6aa34f2c8b8df9c06ea315
parent21a849949cfda389f5fa19d20c10862b58b829d2
parentd9b532558765d9027a95e1b4891aedc3966ba365
Resolved merge conflict in gmx_membed.c
src/kernel/md.c
src/tools/gmx_membed.c