| commit | 29dd8a7e44a384ecb01f3f387f764434a90f0202 | |
| author | Picca Frédéric-Emmanuel <picca@debian.org> | |
| Sun, 29 Dec 2013 10:31:38 +0000 (29 11:31 +0100) | ||
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | |
| Sun, 29 Dec 2013 10:31:38 +0000 (29 11:31 +0100) | ||
| tree | 455edbf2b3b37da1dfc54b4d3a88355ab201083a | treesnapshot (tar.gz zip) |
| parent | f5c116a1bdef94ef2d999d4751523dbfda067759 | commitdiff |
| parent | 7c302b91e2a893cf5e1ba1bb41e37ca45b716480 | commitdiff |
Merge branch 'maint' into next
Conflicts:
hkl/Makefile.am
hkl/hkl-geometry-factory.c
hkl/hkl-geometry-factory.h
hkl/hkl-geometry-private.h
hkl/hkl-pseudoaxis-factory.c
hkl/pom.xml
Conflicts:
hkl/Makefile.am
hkl/hkl-geometry-factory.c
hkl/hkl-geometry-factory.h
hkl/hkl-geometry-private.h
hkl/hkl-pseudoaxis-factory.c
hkl/pom.xml