Public Git Hosting - hkl.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c0ed0ce 50a84fb)

commit	adc13e2193dd6e3322c95502fd6354a4ed0d7c26
author	Picca Frédéric-Emmanuel <picca@debian.org>
	Tue, 24 Jul 2012 08:54:14 +0000 (24 10:54 +0200)
committer	Picca Frédéric-Emmanuel <picca@debian.org>
	Tue, 24 Jul 2012 08:54:14 +0000 (24 10:54 +0200)
tree	fd257eb983f01458d0ed2e45804c6ca9a8f373a0	tree \| snapshot (tar.gz zip)
parent	c0ed0cea56675b26ff81ea7c289a5ede9ffff665	commit \| diff
parent	50a84fb0aef6f9b7f8766592fdafae65f7a4c42c	commit \| diff

Merge branch 'maint' into next

Conflicts:
TODO
configure.ac
hkl/hkl-pseudoaxis-e6c-hkl.c
test/hkl/pseudoaxis-e6c-t.c
test/hkl/pseudoaxis-k6c-t.c

TODO	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-common-hkl.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-common-psi.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-common-q.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e4ch-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e6c-t.c	diff1 \|	diff2 \|	blob \| history
test/tap/hkl.c	diff1 \|	diff2 \|	blob \| history

Diffractometer computation library