From: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Date: Wed, 20 Jun 2012 12:25:33 +0000 (+0200)
Subject: Merge branch 'devel' into feature-ga
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=0a11a2c4ccee14ed99ae44f2565b270ba8d4bbb6

Merge branch 'devel' into feature-ga
---

0a11a2c4ccee14ed99ae44f2565b270ba8d4bbb6
diff --cc .gitignore
index b2a5628,d5a15a6..521532d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,19 +1,20 @@@
+ # ignore compiled stuff
+ *.[oa]
+ 
+ # ignore texteditors
  *.swp
+ *~
+ 
+ # ignore PBS output and error files
+ *.[eo][0-9][0-9][0-9][0-9]*
+ 
+ # ignore build dir
+ build/
 +source/ga/build
+ 
+ # ignored dirs form adasko
+ gradcheck/
+ mapcheck/
+ run/
+ sympcheck/
+