projects / unres.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3176770 71eb7b3)
Merge branch 'prerelease-3.2.1' into czarek
authorCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 18 Feb 2013 08:04:50 +0000 (09:04 +0100)
committerCezary Czaplewski <czarek@chem.univ.gda.pl>
Mon, 18 Feb 2013 08:04:50 +0000 (09:04 +0100)
Conflicts:
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
source/unres/src_MD/cinfo.f
source/unres/src_MD/parmread.F

1  2 
bin/unres/MD/unres_ifort_MPICH_GAB.exe patch | blob1 | blob2 | history
source/unres/src_MD/energy_p_new_barrier.F patch | diff1 | diff2 | blob | history

diff --cc bin/unres/MD/unres_ifort_MPICH_GAB.exe
index 968912a,c8defa0..0000000
deleted file mode 100755,100755
Binary files differ
UNRESPACK 3.x