| commit | 445028891e4d52770bf77d0a798fd32276e95965 | |
| author | Picca Frédéric-Emmanuel <picca@debian.org> | |
| Sun, 17 Jun 2012 19:00:31 +0000 (17 21:00 +0200) | ||
| committer | Picca Frédéric-Emmanuel <picca@debian.org> | |
| Sun, 17 Jun 2012 19:00:31 +0000 (17 21:00 +0200) | ||
| tree | 88c37ffa76e4c6462c70c6895f01631f6fa7a08e | treesnapshot (tar.gz zip) |
| parent | 36c0c65936c81222272b8d9e0a1aa09287d0bd72 | commitdiff |
| parent | 8c599b9e92d809aac8a040cc8ee236128409bab7 | commitdiff |
Merge branch 'introspection' into next
Conflicts:
configure.ac
gui/hkl-gui-modelcolumns.h
gui/hkl-gui.cpp
hkl/hkl-geometry-factory.c
hkl/hkl-geometry-factory.h
hkl/hkl-geometry.c
hkl/hkl-geometry.h
hkl/hkl-lattice.c
hkl/hkl-list.h
hkl/hkl-pseudoaxis-auto.c
hkl/hkl-pseudoaxis-common-hkl.c
hkl/hkl-pseudoaxis-common-psi.c
hkl/hkl-pseudoaxis-common-q.c
hkl/hkl-pseudoaxis.c
hkl/hkl-pseudoaxis.h
hkl/hkl-sample.c
hkl/hkl-sample.h
hkl/hkl-unit.c
hkl/pom.xml
scripts/clean-all
test/hkl/pseudoaxis-t.c
Conflicts:
configure.ac
gui/hkl-gui-modelcolumns.h
gui/hkl-gui.cpp
hkl/hkl-geometry-factory.c
hkl/hkl-geometry-factory.h
hkl/hkl-geometry.c
hkl/hkl-geometry.h
hkl/hkl-lattice.c
hkl/hkl-list.h
hkl/hkl-pseudoaxis-auto.c
hkl/hkl-pseudoaxis-common-hkl.c
hkl/hkl-pseudoaxis-common-psi.c
hkl/hkl-pseudoaxis-common-q.c
hkl/hkl-pseudoaxis.c
hkl/hkl-pseudoaxis.h
hkl/hkl-sample.c
hkl/hkl-sample.h
hkl/hkl-unit.c
hkl/pom.xml
scripts/clean-all
test/hkl/pseudoaxis-t.c
19 files changed: