mmka.chem.univ.gda.pl Git - unres.git/commit

author	Bartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
	Thu, 8 Nov 2012 18:21:29 +0000 (13:21 -0500)
committer	Bartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
	Thu, 8 Nov 2012 18:21:29 +0000 (13:21 -0500)
commit	99975bccd9b54feae02e652dc766282ede174d4f
tree	95428a7a27540c44654f9c88fa77798621bfda20	tree \| snapshot
parent	38a0a2a943632166673328dba7347aa40acdca45	commit \| diff
parent	5a46be58c4ed3ef591a4df6792f627c0f5de8302	commit \| diff

Merge branch 'bartek' of mmka.chem.univ.gda.pl:unres into bartek
Requires git from matrix, becasue of errors: ! [rejected] bartek -> bartek (non-fast-forward)