Public Git Hosting - hkl.git/commit

commit	c0ed0cea56675b26ff81ea7c289a5ede9ffff665
author	Picca Frédéric-Emmanuel <picca@debian.org>
	Sun, 17 Jun 2012 21:05:42 +0000 (17 23:05 +0200)
committer	Picca Frédéric-Emmanuel <picca@debian.org>
	Sun, 17 Jun 2012 21:05:42 +0000 (17 23:05 +0200)
tree	7d2922df03688baa9b3ba217f25d80d384b5ae67	tree \| snapshot (tar.gz zip)
parent	445028891e4d52770bf77d0a798fd32276e95965	commit \| diff
parent	86d308a76f2aed87bfb96ab8f408814b0cfb20ed	commit \| diff

Merge branch 'introspection' into next

Conflicts:
configure.ac
hkl/hkl-geometry-factory.c
hkl/hkl-geometry.c
hkl/hkl-geometry.h
hkl/hkl-pseudoaxis.c
hkl/hkl-pseudoaxis.h
hkl/hkl-sample.c
hkl/hkl-sample.h
hkl/hkl-unit.c
test/hkl/pseudoaxis-t.c

33 files changed:

Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
gui/hkl-gui-callbacks.cpp	diff1 \|	diff2 \|	blob \| history
gui/hkl-gui-pseudoaxes.cpp	diff1 \|	diff2 \|	blob \| history
gui/hkl-gui.cpp	diff1 \|	diff2 \|	blob \| history
hkl/Makefile.am	diff1 \|	diff2 \|	blob \| history
hkl/hkl-detector.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry-factory.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry-factory.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-lattice.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-parameter.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-common-hkl.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-factory.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-quaternion.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-sample.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-sample.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-source.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-type-builtins.c	\|	diff2 \|	blob \| history
hkl/hkl-unit.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-vector.c	diff1 \|	diff2 \|	blob \| history
test/hkl/bench-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/geometry-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e4ch-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e4cv-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e6c-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-k4cv-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-k6c-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-zaxis-t.c	diff1 \|	\|	blob \| history

Diffractometer computation library

RSS Atom

Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
gui/hkl-gui-callbacks.cpp	diff1 \|	diff2 \|	blob \| history
gui/hkl-gui-pseudoaxes.cpp	diff1 \|	diff2 \|	blob \| history
gui/hkl-gui.cpp	diff1 \|	diff2 \|	blob \| history
hkl/Makefile.am	diff1 \|	diff2 \|	blob \| history
hkl/hkl-detector.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry-factory.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry-factory.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-geometry.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-lattice.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-parameter.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-common-hkl.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis-factory.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-pseudoaxis.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-quaternion.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-sample.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-sample.h	diff1 \|	diff2 \|	blob \| history
hkl/hkl-source.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-type-builtins.c	\|	diff2 \|	blob \| history
hkl/hkl-unit.c	diff1 \|	diff2 \|	blob \| history
hkl/hkl-vector.c	diff1 \|	diff2 \|	blob \| history
test/hkl/bench-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/geometry-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e4ch-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e4cv-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-e6c-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-k4cv-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-k6c-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-t.c	diff1 \|	diff2 \|	blob \| history
test/hkl/pseudoaxis-zaxis-t.c	diff1 \|	\|	blob \| history