Merge branch 'maint' into next
commit1f2928a9a6f3d2c4550bbce6dc3b4763ab6d1a49
authorPicca Frédéric-Emmanuel <picca@debian.org>
Wed, 8 Oct 2014 19:23:52 +0000 (8 21:23 +0200)
committerPicca Frédéric-Emmanuel <picca@debian.org>
Wed, 8 Oct 2014 19:23:52 +0000 (8 21:23 +0200)
treecc4fc2ed1130032c61afe7a6bbc7ef2fd9266a50
parentb2c473171eb9286b8d6e4df5313c9d50cd120680
parentdb074524dc45608f238add5caf1d0bf2bfdc5c66
Merge branch 'maint' into next
hkl/hkl-factory.c
hkl/hkl-pseudoaxis-k6c-hkl.c
hkl/hkl-pseudoaxis-k6c-private.h
hkl/hkl-pseudoaxis-k6c-psi.c