From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Tue, 19 Feb 2013 00:50:42 +0000 (+0100)
Subject: Merge branch 'prerelease-3.2.1' into devel
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=1606e1ed3e01fa02529bc9121a2583e4328ff69b

Merge branch 'prerelease-3.2.1' into devel

Conflicts:
	bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe
	bin/unres/MD/unres_gfortran_single_GAB.exe
	bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
	bin/unres/MD/unres_ifort_MPICH_GAB.exe
	bin/unres/MD/unres_ifort_single_GAB.exe
	bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
	source/unres/src_CSA/Makefile
	source/unres/src_CSA_DiL/refsys.f
	source/unres/src_MD-M/Makefile
	source/unres/src_MD/parmread.F
	source/unres/src_MD_DFA/COMMON.REFSYS
---

1606e1ed3e01fa02529bc9121a2583e4328ff69b
diff --cc bin/unres/MD/unres_gfortran_single_GAB.exe
index 56d88f3,53c580e..0000000
deleted file mode 100755,100755
Binary files differ
diff --cc bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
index 9c6a86c,709c25e..0000000
deleted file mode 100755,100755
Binary files differ
diff --cc bin/unres/MD/unres_ifort_MPICH_GAB.exe
index 8099588,05159f5..0000000
deleted file mode 100755,100755
Binary files differ
diff --cc bin/unres/MD/unres_ifort_single_GAB.exe
index 7107570,93d0028..0000000
deleted file mode 100755,100755
Binary files differ
diff --cc bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
index 2e7d215,78e6748..0000000
deleted file mode 100755,100755
Binary files differ
diff --cc source/unres/src_CSA_DiL/refsys.f
index 8efc1ea,b57c201..05030b5
--- a/source/unres/src_CSA_DiL/refsys.f
+++ b/source/unres/src_CSA_DiL/refsys.f
@@@ -11,6 -11,7 +11,10 @@@ c form a linear fragment. returns vecto
        logical fail
        double precision e1(3),e2(3),e3(3)
        double precision u(3),z(3)
++<<<<<<< HEAD
++=======
+       include 'COMMON.IOUNITS'
++>>>>>>> prerelease-3.2.1
        include "COMMON.CHAIN"
        data coinc /1.0d-13/,align /1.0d-13/
        fail=.false.
diff --cc source/unres/src_MIN/CMakeLists.txt
index 0ebc88f,6731173..3d930f7
--- a/source/unres/src_MIN/CMakeLists.txt
+++ b/source/unres/src_MIN/CMakeLists.txt
@@@ -33,8 -33,8 +33,9 @@@ set(UNRES_MIN_SRC
  	printmat.f 
  	randgens.f 
  	readrtns_min.F
 +	refsys.f
  	rescode.f 
+ 	refsys.f
  	rmdd.f 
  	sc_move.F
  	sumsld.f