Merge branch 'adasko' of mmka:unres into adasko
authorAndrei Niadzvedtski <nedved@sun1.chem.univ.gda.pl>
Fri, 23 Nov 2012 09:08:52 +0000 (10:08 +0100)
committerAndrei Niadzvedtski <nedved@sun1.chem.univ.gda.pl>
Fri, 23 Nov 2012 09:08:52 +0000 (10:08 +0100)
commit5d242913b3207e13cb1453cd1eecd0209d145207
tree36b5b25596fe05ed330eeee449298ac21cb29f13
parentc68e70d1f47d7ec3486c02b1e0e87f2b04e0518c
parent6e2307bd3ed6caeb33f811867a2bc1176da2a710
Merge branch 'adasko' of mmka:unres into adasko

usuniecie konfiliktu
Conflicts:
source/unres/src_MD-M/CMakeLists.txt
source/unres/src_MD-M/CMakeLists.txt