Merge branch 'devel' of mmka:unres into devel
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 6 Jul 2012 09:52:30 +0000 (11:52 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Fri, 6 Jul 2012 09:52:30 +0000 (11:52 +0200)
1  2 
.gitignore

diff --cc .gitignore
Simple merge