From: Adam Kazimierz Sieradzan <adasko@sun1.chem.univ.gda.pl>
Date: Mon, 18 Jun 2012 10:22:21 +0000 (-0400)
Subject: Merge branch 'adasko' into devel
X-Git-Tag: v.3.2~83
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=478f5fd9e95bd5665ab58ee691f517d7dab379b3

Merge branch 'adasko' into devel

Conflicts:
	.gitignore
---

478f5fd9e95bd5665ab58ee691f517d7dab379b3
diff --cc .gitignore
index 918a787,d5615a4..abb3640
--- a/.gitignore
+++ b/.gitignore
@@@ -1,11 -1,6 +1,19 @@@
++<<<<<<< HEAD
 +# ignore compiled stuff
 +*.[oa]
 +
 +# ignore texteditors
 +*.swp
 +*~
 +
 +
 +# ifnore build dir
 +build/
++=======
+ ~.[ao]
+ gradcheck/
+ mapcheck/
+ run/
+ sympcheck/
++>>>>>>> adasko