From: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Date: Fri, 6 Jul 2012 09:52:30 +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=f42bb72e74ac3157e464e5d720854157a7c0cabb;hp=-c;p=unres.git

Merge branch 'devel' of mmka:unres into devel
---

f42bb72e74ac3157e464e5d720854157a7c0cabb
diff --combined .gitignore
index 7fe4126,5e03956..8b33225
--- a/.gitignore
+++ b/.gitignore
@@@ -11,14 -11,11 +11,16 @@@
  # ignore build dir
  build/
  
 +# latex files in documentation 
 +doc/*/*.aux
 +doc/*/*.log
 +
 +
  # ignored dirs form adasko
  gradcheck/
  mapcheck/
  run/
  sympcheck/
  compinfo
+ DIL/
+ bin/unres/MD/unres_ifort_MPICH_GAB_czyt.exe