unres.git
9 years agofixed install binary paths
Dawid Jagiela [Wed, 6 May 2015 18:56:05 +0000 (20:56 +0200)]
fixed install binary paths

9 years agoMPICH2 and energy fixes in WHAM-M and Cluster-M.
Pawel Krupa [Tue, 21 Apr 2015 23:18:13 +0000 (01:18 +0200)]
MPICH2 and energy fixes in WHAM-M and Cluster-M.

9 years agoMerge branch 'devel' of mmka:unres into devel
Adam Sieradzan [Fri, 17 Apr 2015 19:35:05 +0000 (21:35 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agoFixed error caused by new MPICH2, which made WHAM-M non-usable.
Pawel Krupa [Fri, 17 Apr 2015 19:29:59 +0000 (21:29 +0200)]
Fixed error caused by new MPICH2, which made WHAM-M non-usable.

9 years agopoprawka w COMMON.SBRIDE dla triss
Adam Sieradzan [Fri, 17 Apr 2015 17:50:27 +0000 (19:50 +0200)]
poprawka w COMMON.SBRIDE dla triss

9 years agoFixed energy differs in WHAM-M (EBE).
Pawel Krupa [Thu, 16 Apr 2015 20:58:27 +0000 (22:58 +0200)]
Fixed energy differs in WHAM-M (EBE).

9 years agopoprawka w intcartderiv
Adam Sieradzan [Mon, 13 Apr 2015 15:12:45 +0000 (17:12 +0200)]
poprawka w intcartderiv

9 years agoIntroduction of SS to newcorr and SSS to src_MD-M
Adam Sieradzan [Mon, 13 Apr 2015 15:07:52 +0000 (17:07 +0200)]
Introduction of SS to newcorr and SSS to src_MD-M

9 years agoMerge branch 'devel' of mmka:unres into devel
Dawid Jagiela [Sun, 5 Apr 2015 21:04:43 +0000 (23:04 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agoadded Force-Fields descriptions in exe filenames
Dawid Jagiela [Sun, 5 Apr 2015 20:29:31 +0000 (22:29 +0200)]
added Force-Fields descriptions in exe filenames

9 years agoMD problems fixed with FGPROC>1
Pawel Krupa [Thu, 26 Mar 2015 19:05:59 +0000 (20:05 +0100)]
MD problems fixed with FGPROC>1

9 years agopoprawki w ANG w src_MD-M
Adam Sieradzan [Thu, 19 Feb 2015 11:43:23 +0000 (12:43 +0100)]
poprawki w ANG w src_MD-M

9 years agoCorrected refsys.f in src_MD-M
Adam Liwo [Fri, 23 Jan 2015 20:29:12 +0000 (21:29 +0100)]
Corrected refsys.f in src_MD-M

Conflicts:

bin/unres/MD/unres-mult-symetr_ifort_MPICH_E0LL2Y.exe
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/cinfo.f
source/unres/src_MD-M/readpdb.F

9 years agochanges from prerelease src_CSA_DiL copied to devel
Cezary Czaplewski [Fri, 5 Dec 2014 10:36:00 +0000 (11:36 +0100)]
changes from prerelease src_CSA_DiL copied to devel

9 years agofixed src_MD_DFA ala10 ctest
Dawid Jagiela [Thu, 6 Nov 2014 00:25:35 +0000 (01:25 +0100)]
fixed src_MD_DFA ala10 ctest

9 years ago1) changes for FindMPI macro in source/unres/src_MD_DFA
Dawid Jagiela [Thu, 6 Nov 2014 00:12:54 +0000 (01:12 +0100)]
1) changes for FindMPI macro in source/unres/src_MD_DFA
2) fixed broken if-then statement

9 years agofixed marge problem
Dawid Jagiela [Wed, 5 Nov 2014 22:53:39 +0000 (23:53 +0100)]
fixed marge problem

9 years agoMerge branch 'prerelease-3.2.1' into devel
Dawid Jagiela [Wed, 5 Nov 2014 22:44:32 +0000 (23:44 +0100)]
Merge branch 'prerelease-3.2.1' into devel

Conflicts:
.gitignore
CMakeLists.txt
source/cluster/wham/src/COMMON.SCCOR
source/maxlik/src_CSA/CMakeLists.txt
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_MD-M/CMakeLists.txt
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/ssMD.F
source/unres/src_MD/CMakeLists.txt
source/unres/src_MIN/CMakeLists.txt
source/wham/src/DIMENSIONS.FREE
source/xdrfpdb/src/CMakeLists.txt

9 years agoMerge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Dawid Jagiela [Wed, 5 Nov 2014 21:44:43 +0000 (22:44 +0100)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1

9 years agoctest ala10 binary location fix
Dawid Jagiela [Wed, 5 Nov 2014 21:44:05 +0000 (22:44 +0100)]
ctest ala10 binary location fix

9 years agoAdded CMake build instructions
Dawid Jagieła [Wed, 5 Nov 2014 08:56:10 +0000 (09:56 +0100)]
Added CMake build instructions

9 years agofix for multiple MPI include paths passed by MPI wrapper
Dawid Jagiela [Fri, 31 Oct 2014 22:48:33 +0000 (23:48 +0100)]
fix for multiple MPI include paths passed by MPI wrapper

9 years ago1) binaries are compiled into /bin subdirectory of build directory
Dawid Jagiela [Mon, 27 Oct 2014 22:19:36 +0000 (23:19 +0100)]
1) binaries are compiled into /bin subdirectory of build directory
2) added "make install" support costumizable with CMAKE_INSTALL_PREFIX

9 years ago1) Threading cleanup in src_CSA & src_CSA_DiL
Dawid Jagiela [Sun, 26 Oct 2014 21:58:46 +0000 (22:58 +0100)]
1) Threading cleanup in src_CSA & src_CSA_DiL
2) Makefile verbose turned off for "Release" builds
3) fixed missing printmat.f in cluster/wham/src/CMakeLists.txt

9 years agoswitched to CMake FindMPI module in all source files that use MPI
Dawid Jagiela [Sun, 26 Oct 2014 16:03:50 +0000 (17:03 +0100)]
switched to CMake FindMPI module in all source files that use MPI

9 years agoswitched to CMake FindMPI module in all source files that use MPI
Dawid Jagiela [Sun, 26 Oct 2014 16:03:50 +0000 (17:03 +0100)]
switched to CMake FindMPI module in all source files that use MPI

9 years agoadded missing preprocessor flags for prng_32.F
Dawid Jagiela [Sun, 26 Oct 2014 14:33:10 +0000 (15:33 +0100)]
added missing preprocessor flags for prng_32.F

9 years agoprng.f unification
Dawid Jagiela [Sat, 25 Oct 2014 21:45:17 +0000 (23:45 +0200)]
prng.f unification

9 years ago64-bit fix for unres/CSA and unres/CSA_DiL code
Dawid Jagiela [Thu, 16 Oct 2014 23:51:51 +0000 (01:51 +0200)]
64-bit fix for unres/CSA and unres/CSA_DiL code

9 years agoMerge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Dawid Jagieła [Tue, 14 Oct 2014 22:30:49 +0000 (00:30 +0200)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1

9 years agofixed CMake variable typo
Dawid Jagieła [Tue, 14 Oct 2014 22:29:43 +0000 (00:29 +0200)]
fixed CMake variable typo

9 years agocorrect default option for compilers in cluster CmakeList.txt
Cezary Czaplewski [Wed, 8 Oct 2014 10:32:04 +0000 (12:32 +0200)]
correct default option for compilers in cluster CmakeList.txt

9 years agocorrect default option for compilers in wham CmakeList.txt
Cezary Czaplewski [Wed, 8 Oct 2014 10:09:44 +0000 (12:09 +0200)]
correct default option for compilers in wham CmakeList.txt

9 years agoadded "make install" support for: unres (MD, MD-M, MIN) and maxlik
Dawid Jagiela [Wed, 23 Jul 2014 11:05:07 +0000 (13:05 +0200)]
added "make install" support for: unres (MD, MD-M, MIN) and maxlik

9 years agoBUG FIX for SUMSL minimization
Adam Kazimierz Sieradzan [Fri, 4 Jul 2014 18:40:17 +0000 (14:40 -0400)]
BUG FIX for SUMSL minimization

9 years agoMerge branch 'devel' of mmka:unres into devel
Adam Sieradzan [Tue, 24 Jun 2014 08:41:41 +0000 (10:41 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agobug fix for langevin dynamics
Adam Sieradzan [Tue, 24 Jun 2014 08:26:42 +0000 (10:26 +0200)]
bug fix for langevin dynamics

9 years agoMakefile without debuging
Cezary Czaplewski [Tue, 24 Jun 2014 06:46:23 +0000 (08:46 +0200)]
Makefile without debuging

9 years agoMerge branch 'devel' of mmka:unres into devel
Cezary Czaplewski [Wed, 18 Jun 2014 12:56:05 +0000 (14:56 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agodyn-ss in MD-M
Cezary Czaplewski [Wed, 18 Jun 2014 12:53:25 +0000 (14:53 +0200)]
dyn-ss in MD-M

9 years agodalej wylaczona diagnostyka
Adam Kazimierz Sieradzan [Tue, 17 Jun 2014 19:13:00 +0000 (15:13 -0400)]
dalej wylaczona diagnostyka

9 years agowylacznie diagnostyki
Adam Kazimierz Sieradzan [Tue, 17 Jun 2014 18:18:21 +0000 (14:18 -0400)]
wylacznie diagnostyki

9 years agocorrecter Makefile and errors side chain parameters
Cezary Czaplewski [Tue, 17 Jun 2014 11:18:05 +0000 (13:18 +0200)]
correcter Makefile and errors side chain parameters

9 years agoMerge branch 'devel' of mmka:unres into devel
Cezary Czaplewski [Tue, 17 Jun 2014 09:42:27 +0000 (11:42 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agoxdrf2x tests
Cezary Czaplewski [Tue, 17 Jun 2014 09:34:30 +0000 (11:34 +0200)]
xdrf2x tests

9 years agofixed typo
Dawid Jagieła [Tue, 3 Jun 2014 15:35:28 +0000 (17:35 +0200)]
fixed typo

9 years agofix for MD tests in E0LL2Y FF
Dawid Jagieła [Tue, 3 Jun 2014 15:16:39 +0000 (17:16 +0200)]
fix for MD tests in E0LL2Y FF

9 years agofixed binary name generation in unres/src_MD-M
Dawid Jagieła [Tue, 3 Jun 2014 11:57:14 +0000 (13:57 +0200)]
fixed binary name generation in unres/src_MD-M

9 years agokolejne porzadki
Dawid Jagieła [Tue, 3 Jun 2014 11:54:04 +0000 (13:54 +0200)]
kolejne porzadki

9 years agoMerge branch 'devel' of mmka:unres into devel
Dawid Jagieła [Tue, 3 Jun 2014 11:48:09 +0000 (13:48 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agowywalka smieci - ludzie budujcie w katalogu build!
Dawid Jagieła [Tue, 3 Jun 2014 11:47:06 +0000 (13:47 +0200)]
wywalka smieci - ludzie budujcie w katalogu build!

9 years agoMerge branch 'devel' of mmka:unres into devel
Bartlomiej Zaborowski [Tue, 3 Jun 2014 11:18:28 +0000 (13:18 +0200)]
Merge branch 'devel' of mmka:unres into devel

9 years agoNew CMake files after cleaning
Bartlomiej Zaborowski [Tue, 3 Jun 2014 11:16:30 +0000 (13:16 +0200)]
New CMake files after cleaning

9 years agoModification files required corresponding architecture
Bartlomiej Zaborowski [Tue, 3 Jun 2014 11:13:06 +0000 (13:13 +0200)]
Modification files required corresponding architecture

9 years agoModification files required corresponding architecture
Bartlomiej Zaborowski [Tue, 3 Jun 2014 11:11:13 +0000 (13:11 +0200)]
Modification files required corresponding architecture

10 years agowlaczenie timing
Adam Sieradzan [Thu, 8 May 2014 15:36:52 +0000 (17:36 +0200)]
wlaczenie timing

10 years agoMerge branch 'devel' of mmka:unres into devel
Adam Sieradzan [Thu, 8 May 2014 15:25:43 +0000 (17:25 +0200)]
Merge branch 'devel' of mmka:unres into devel

10 years ago1) added warnings suppression if find_package(MPI) failes to find MPI
Dawid Jagiela [Fri, 25 Apr 2014 07:54:20 +0000 (03:54 -0400)]
1) added warnings suppression if find_package(MPI) failes to find MPI
2) removed non-standardold MPI paths - should be passed by cmake variables directly

10 years ago1) added warnings suppression if find_package(MPI) failes to find MPI
Dawid Jagiela [Fri, 25 Apr 2014 07:54:20 +0000 (03:54 -0400)]
1) added warnings suppression if find_package(MPI) failes to find MPI
2) removed non-standardold MPI paths - should be passed by cmake variables directly

10 years agoDON'T DELETE THE "git-daemon-export-ok" FILE!!!
Dawid Jagieła [Tue, 15 Apr 2014 11:31:34 +0000 (13:31 +0200)]
DON'T DELETE THE "git-daemon-export-ok" FILE!!!
This file is mandatory for proper git-deamon work - without it you cannot access the repository using the git protocol "git://"

10 years agoMerge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
Adam Liwo [Thu, 10 Apr 2014 19:57:52 +0000 (15:57 -0400)]
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel

Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe

10 years agoAdded new files to the NEWCORR version
Adam Liwo [Thu, 10 Apr 2014 18:28:20 +0000 (14:28 -0400)]
Added new files to the NEWCORR version

10 years agoAdded source/wham/src-NEWSC-NEWCORR/
Adam Liwo [Thu, 10 Apr 2014 18:24:39 +0000 (14:24 -0400)]
Added  source/wham/src-NEWSC-NEWCORR/

10 years agoAdded src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC...
Adam Liwo [Thu, 10 Apr 2014 11:57:44 +0000 (07:57 -0400)]
Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)

10 years agoAdded src_Eshel (decoy processing for threading)
Adam Liwo [Tue, 1 Apr 2014 04:37:15 +0000 (00:37 -0400)]
Added src_Eshel (decoy processing for threading)

10 years agoFixed iatsc_s and iatscp_s for 1 residue (was 0 with MPI version)
Adam Liwo [Wed, 19 Mar 2014 08:06:29 +0000 (04:06 -0400)]
Fixed iatsc_s and iatscp_s for 1 residue (was 0 with MPI version)

10 years agoDevel ma zle COMMON.TORSIONAL w src_MD (single chain)
Adam Sieradzan [Tue, 18 Mar 2014 07:21:27 +0000 (08:21 +0100)]
Devel ma zle COMMON.TORSIONAL w src_MD (single chain)

10 years agoPoprawione przyklady w polu ff_gab (zmieniony potencjal SIDEPAR na: v.3.2
Pawel Krupa [Wed, 20 Nov 2013 15:57:39 +0000 (10:57 -0500)]
Poprawione przyklady w polu ff_gab (zmieniony potencjal SIDEPAR na:
sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k).

10 years agoPoprawione przyklady do pola ff_gab (zmieniony potencjal SIDEPAR na: sc_GB_opt.1gab_3...
Pawel Krupa [Wed, 20 Nov 2013 15:53:22 +0000 (10:53 -0500)]
Poprawione przyklady do pola ff_gab (zmieniony potencjal SIDEPAR na: sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k).

10 years agoMerge branch 'devel' of mmka:unres into devel
Dawid Jagiela [Wed, 6 Nov 2013 10:01:12 +0000 (11:01 +0100)]
Merge branch 'devel' of mmka:unres into devel

10 years agojunk files cleanup
Dawid Jagiela [Wed, 6 Nov 2013 10:00:38 +0000 (11:00 +0100)]
junk files cleanup

10 years agoMerge branch 'devel' of mmka:unres into devel
Adam Sieradzan [Tue, 5 Nov 2013 22:44:36 +0000 (23:44 +0100)]
Merge branch 'devel' of mmka:unres into devel

10 years agoBugfix for smaller size of memory
Adam Sieradzan [Tue, 5 Nov 2013 22:32:58 +0000 (23:32 +0100)]
Bugfix for smaller size of memory

10 years ago deleted: cluster/wham/src-M/permut.o
Dawid Jagiela [Tue, 5 Nov 2013 20:45:53 +0000 (21:45 +0100)]
deleted:    cluster/wham/src-M/permut.o

10 years agoDebug part 11
Adam Sieradzan [Tue, 5 Nov 2013 20:10:47 +0000 (21:10 +0100)]
Debug part 11

10 years agoDebug part 10
Adam Sieradzan [Tue, 5 Nov 2013 20:02:11 +0000 (21:02 +0100)]
Debug part 10

10 years agoDebug part 9
Adam Sieradzan [Tue, 5 Nov 2013 19:42:53 +0000 (20:42 +0100)]
Debug part 9

10 years agoDebug part 8
Adam Sieradzan [Tue, 5 Nov 2013 19:30:19 +0000 (20:30 +0100)]
Debug part 8

10 years agoDebug cd 7
Adam Sieradzan [Tue, 5 Nov 2013 19:07:23 +0000 (20:07 +0100)]
Debug cd 7

10 years agoDebug part 7
Adam Sieradzan [Tue, 5 Nov 2013 18:35:49 +0000 (19:35 +0100)]
Debug part 7

10 years agoDebug part 6
Adam Sieradzan [Tue, 5 Nov 2013 18:02:35 +0000 (19:02 +0100)]
Debug part 6

10 years agoDebug part 5
Adam Sieradzan [Tue, 5 Nov 2013 17:49:55 +0000 (18:49 +0100)]
Debug part 5

10 years agoDebug part 4
Adam Sieradzan [Tue, 5 Nov 2013 17:30:04 +0000 (18:30 +0100)]
Debug part 4

10 years agoDebug part 3
Adam Sieradzan [Tue, 5 Nov 2013 17:24:58 +0000 (18:24 +0100)]
Debug part 3

10 years agoDebug part 2
Adam Sieradzan [Tue, 5 Nov 2013 17:04:35 +0000 (18:04 +0100)]
Debug part 2

10 years agoDebug part 1
Adam Sieradzan [Tue, 5 Nov 2013 16:30:27 +0000 (17:30 +0100)]
Debug part 1

10 years agoMerge branch 'adasko' into devel
Adam Sieradzan [Tue, 5 Nov 2013 13:51:57 +0000 (14:51 +0100)]
Merge branch 'adasko' into devel

Conflicts:
source/unres/src_MD/Makefile

10 years agoMerge branch 'devel' of mmka:unres into devel
Adam Sieradzan [Tue, 5 Nov 2013 13:39:58 +0000 (14:39 +0100)]
Merge branch 'devel' of mmka:unres into devel

10 years agoignorowanie build2
Adam Sieradzan [Tue, 5 Nov 2013 13:39:29 +0000 (14:39 +0100)]
ignorowanie build2

10 years agopierwsza proba merga devela do adasko
Adam Sieradzan [Tue, 5 Nov 2013 13:37:15 +0000 (14:37 +0100)]
pierwsza proba merga devela do adasko
Merge branch 'devel' into adasko

Conflicts:
.gitignore
PARAM/pot_theta_G631_DIL.parm
PARAM/pot_theta_G631_DIL_ext.parm
bin/unres/MD-M/unres_Tc_procor_oldparm_em64-D-symetr.exe
bin/unres_clustMD_MPI-oldparm
bin/wham/wham_multparm-ham_rep-oldparm
source/cluster/wham/src-M/CMakeLists.txt
source/cluster/wham/src-M/COMMON.SCCOR
source/cluster/wham/src-M/cartprint.o
source/cluster/wham/src-M/chainbuild.o
source/cluster/wham/src-M/contact.o
source/cluster/wham/src-M/convert.o
source/cluster/wham/src-M/energy_p_new.o
source/cluster/wham/src-M/geomout.o
source/cluster/wham/src-M/hc.o
source/cluster/wham/src-M/initialize_p.o
source/cluster/wham/src-M/int_from_cart1.o
source/cluster/wham/src-M/main_clust.o
source/cluster/wham/src-M/parmread.o
source/cluster/wham/src-M/permut.o
source/cluster/wham/src-M/proc_proc.o
source/cluster/wham/src-M/read_coords.o
source/cluster/wham/src-M/read_ref_str.o
source/cluster/wham/src-M/readpdb.o
source/cluster/wham/src-M/readrtns.o
source/cluster/wham/src-M/rescode.o
source/cluster/wham/src-M/setup_var.o
source/cluster/wham/src-M/wrtclust.o
source/cluster/wham/src-M/xdrf/libxdrf.a
source/cluster/wham/src/energy_p_new.F
source/unres/src_MD-M/COMMON.SCCOR
source/unres/src_MD-M/COMMON.TORSION
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/cinfo.f
source/unres/src_MD-M/stochfric.F
source/unres/src_MD/COMMON.LOCAL
source/unres/src_MD/COMMON.SCCOR
source/unres/src_MD/Makefile
source/unres/src_MD/cinfo.f
source/unres/src_MD/parmread.F
source/wham/src-M/CMakeLists.txt
source/wham/src-M/cinfo.f
source/wham/src-M/include_unres/COMMON.SCCOR
source/wham/src/Makefile
source/wham/src/cinfo.f
source/wham/src/enecalc1.F
source/wham/src/energy_p_new.F
source/wham/src/include_unres/COMMON.SCCOR
source/wham/src/int_from_cart.f
source/wham/src/parmread.F

10 years agoDostosowanie w src whama i clustra
Adam Sieradzan [Tue, 5 Nov 2013 13:15:27 +0000 (14:15 +0100)]
Dostosowanie w src whama i clustra

10 years agoMerge branch 'adasko' of mmka:unres into adasko
Adam Sieradzan [Tue, 5 Nov 2013 07:15:34 +0000 (08:15 +0100)]
Merge branch 'adasko' of mmka:unres into adasko

10 years agoMakefile for pgi 2013
Cezary Czaplewski [Wed, 30 Oct 2013 20:51:11 +0000 (21:51 +0100)]
Makefile for pgi 2013

10 years agoMerge branch 'devel' of mmka:unres into devel
Cezary Czaplewski [Wed, 30 Oct 2013 18:33:20 +0000 (19:33 +0100)]
Merge branch 'devel' of mmka:unres into devel

10 years agotesting Makefile for pgi compiler
Cezary Czaplewski [Wed, 30 Oct 2013 18:31:24 +0000 (19:31 +0100)]
testing Makefile for pgi compiler

10 years agodrobnostki w ext theta (cofniete)
Adam Sieradzan [Wed, 16 Oct 2013 13:51:06 +0000 (15:51 +0200)]
drobnostki w ext theta (cofniete)

10 years agosmall correctian in wham
Adam Sieradzan [Mon, 7 Oct 2013 17:45:58 +0000 (19:45 +0200)]
small correctian in wham

10 years agoshow_UNRES.py - large loops speedup by using xrange
Dawid Jagiela [Sun, 22 Sep 2013 13:26:40 +0000 (15:26 +0200)]
show_UNRES.py - large loops speedup by using xrange

10 years agoMerge branch 'devel' of mmka:unres into devel
Dawid Jagiela [Mon, 2 Sep 2013 15:06:12 +0000 (17:06 +0200)]
Merge branch 'devel' of mmka:unres into devel

10 years agoresolved conflicts in: source/unres/src_MD/CMakeLists.txt
Dawid Jagiela [Mon, 2 Sep 2013 15:05:23 +0000 (17:05 +0200)]
resolved conflicts in: source/unres/src_MD/CMakeLists.txt