From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Mon, 2 Sep 2013 13:20:28 +0000 (+0200)
Subject: Merge branch 'devel' of mmka:unres into devel
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=4d1af7875f88832552e868c042c6988762d80110;hp=492cd1b490a2e0259b8e9447eac11a9466cf6df9;p=unres.git

Merge branch 'devel' of mmka:unres into devel

Conflicts:
	source/unres/src_MD/CMakeLists.txt
---

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index 441d99a..d44dcc5 100644
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -162,12 +162,18 @@ elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   #set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
   set(FFLAGS3 "-std=legacy -I. " )
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 elseif (Fortran_COMPILER_NAME STREQUAL "g77")
   set(FFLAGS0 "-I ${CMAKE_CURRENT_SOURCE_DIR} " ) 
   set(FFLAGS1 "-g -I ${CMAKE_CURRENT_SOURCE_DIR} " ) 
   set(FFLAGS2 "-I ${CMAKE_CURRENT_SOURCE_DIR} ")
   set(FFLAGS3 "-I ${CMAKE_CURRENT_SOURCE_DIR} " )
+<<<<<<< HEAD
+>>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
+=======
 >>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
@@ -221,6 +227,12 @@ elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77") 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+elseif (Fortran_COMPILER_NAME STREQUAL "g77")
+  # Add old gfortran flags
+  set(CPPFLAGS "${CPPFLAGS} -DG77")
+>>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 =======
 elseif (Fortran_COMPILER_NAME STREQUAL "g77")
   # Add old gfortran flags