| commit | 04d60389836cd058128731047ba05f65cc0ce179 | |
| author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | |
| Mon, 3 May 2010 17:52:52 +0000 (3 19:52 +0200) | ||
| committer | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | |
| Mon, 3 May 2010 17:52:52 +0000 (3 19:52 +0200) | ||
| tree | b1c89cdc366aa4bc4e53effad9b767c0fa7a2036 | treesnapshot (tar.gz zip) |
| parent | aac0500c5f77c8cecfe5aaf337bccc4e38494866 | commitdiff |
| parent | 40143f105d9cc944ee3ab5f0bb68bf0fb19fe1f3 | commitdiff |
Merge branch 'next'
Conflicts:
gui/DiffabsDemo/Makefile.am
hkl3d/hkl3d.cpp
test/gui/DiffabsDemo/DiffabsDemo.cpp
Conflicts:
gui/DiffabsDemo/Makefile.am
hkl3d/hkl3d.cpp
test/gui/DiffabsDemo/DiffabsDemo.cpp