| commit | 98573f2933dca2ca2ef5f2973b2ca8c47bdb0cfa | |
| author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | |
| Mon, 14 Aug 2017 08:33:01 +0000 (14 10:33 +0200) | ||
| committer | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | |
| Mon, 14 Aug 2017 08:33:01 +0000 (14 10:33 +0200) | ||
| tree | 47024fce457ef16f3d9fdf387064b3b87638e1cf | treesnapshot (tar.gz zip) |
| parent | d39a9ed5a2985c528fbd3614e95566aa47ee2c73 | commitdiff |
| parent | 568d17d2334c3ac01e6da3c21c95248a65c73fde | commitdiff |
Merge branch 'maint' into next
# Conflicts:
# Documentation/Makefile.am
# hkl/pom.xml
# Conflicts:
# Documentation/Makefile.am
# hkl/pom.xml
| Documentation/hkl.org.in | diff1 | diff2 | blobhistory |
| hkl/hkl-engine-e4c.c | diff1 | diff2 | blobhistory |
| hkl3d/hkl3d.h | diff1 | diff2 | blobhistory |
| tests/hkl3d-test-t.c | diff1 | diff2 | blobhistory |