Public Git Hosting - hkl.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 18999cb 49fb23d)

commit	1901ca074ec3dce4432e99cd9b6c8ac3079ef6c7
author	System User <picca@synchrotron-soleil.fr>
	Tue, 12 Apr 2016 12:25:13 +0000 (12 14:25 +0200)
committer	System User <picca@synchrotron-soleil.fr>
	Tue, 12 Apr 2016 12:25:13 +0000 (12 14:25 +0200)
tree	4499d74dac73090ff1dfd8fabbed2fe800915d0b	tree \| snapshot (tar.gz zip)
parent	18999cbd9d680fbfaeb8f3f296df828f468cd2d3	commit \| diff
parent	49fb23d4583014e18fd476ca97a5151b9b95e19c	commit \| diff

Merge branch 'maint' into next

Conflicts:
Documentation/hkl.org.in

Documentation/hkl.org.in	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry-private.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-parameter-private.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-parameter.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-unit-private.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-unit.c	diff1 \|	diff2 \|	blob \| history
tests/hkl-geometry-t.c	diff1 \|	diff2 \|	blob \| history
tests/hkl-unit-t.c	diff1 \|	diff2 \|	blob \| history

Diffractometer computation library