From: Adam Sieradzan <adasko@piasek2.(none)>
Date: Tue, 5 Nov 2013 13:39:58 +0000 (+0100)
Subject: Merge branch 'devel' of mmka:unres into devel
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=2d33f82339bda8759795452c7e56f5c4ecb31edc;hp=b3de597cfbadf7bf7b1a2770ea1bdc97686e4189;p=unres.git

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

diff --git a/.gitignore b/.gitignore
index 8145177..2d9541f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ cinfo.f
 
 # ignore build dir
 build/
+build2/
 
 # latex files in documentation 
 doc/*/*.aux