This is an automated email from the git hooks/post-receive script. hmmr-guest pushed a commit to branch master in repository aghermann.
commit e2e82928326925a2f0b74381daea5989325dbbf7 Merge: 9acd465 124d37a Author: Andrei Zavada <[email protected]> Date: Mon Aug 19 12:34:46 2013 +0300 Merge branch 'master' of github.com:hmmr/aghermann .gitignore | 41 ---- Makefile.am | 27 --- debian/changelog | 2 +- debian/unwanted-files | 1 - src/.gitignore | 1 - src/Makefile.am | 5 - src/common/Makefile.am | 32 --- unwanted-files | 21 -- .gitignore => upstream/.gitignore | 3 +- AUTHORS => upstream/AUTHORS | 0 COPYING => upstream/COPYING | 0 ChangeLog => upstream/ChangeLog | 2 +- INSTALL => upstream/INSTALL | 0 upstream/Makefile.am | 13 ++ NEWS => upstream/NEWS | 0 README => upstream/README | 0 autogen.sh => upstream/autogen.sh | 0 configure.ac => upstream/configure.ac | 2 +- {data => upstream/data}/.gitignore | 0 {data => upstream/data}/Makefile.am | 0 {data => upstream/data}/aghermann.desktop.in | 0 {data => upstream/data}/aghermann.gresource.xml | 0 {data => upstream/data}/aghermann.png | Bin 2592 -> 2592 bytes {data => upstream/data}/edfhed-gtk.desktop.in | 0 {data => upstream/data}/edfhed.glade | 0 {data => upstream/data}/equation-uc.png | Bin 4467 -> 4467 bytes {data => upstream/data}/equations1.png | Bin 20489 -> 20489 bytes {data => upstream/data}/experiment-dl.sh | 0 {data => upstream/data}/icon.svg | 0 {data => upstream/data}/idle-bg.svg | 0 {data => upstream/data}/mf.glade | 0 {data => upstream/data}/mw-dialogs.glade | 0 {data => upstream/data}/mw.glade | 0 {data => upstream/data}/sf-artifacts-simple.glade | 0 {data => upstream/data}/sf-artifacts.glade | 0 {data => upstream/data}/sf-filters.glade | 0 {data => upstream/data}/sf-patterns.glade | 0 {data => upstream/data}/sf-phasediff.glade | 0 {data => upstream/data}/sf.glade | 0 {data => upstream/data}/sm.glade | 0 {doc => upstream/doc}/Makefile.am | 0 {doc => upstream/doc}/org/.gitignore | 0 {doc => upstream/doc}/org/Makefile.am | 0 {doc => upstream/doc}/org/aghermann.org.in | 0 {doc => upstream/doc}/org/img/annotations-t.png | Bin 7839 -> 7839 bytes {doc => upstream/doc}/org/img/annotations.png | Bin 19066 -> 19066 bytes {doc => upstream/doc}/org/img/edfhed-gtk-t.png | Bin 20996 -> 20996 bytes {doc => upstream/doc}/org/img/edfhed-gtk.png | Bin 56713 -> 56713 bytes {doc => upstream/doc}/org/img/equation-uc.png | Bin 2478 -> 2478 bytes {doc => upstream/doc}/org/img/ica-t.png | Bin 47609 -> 47609 bytes {doc => upstream/doc}/org/img/ica.png | Bin 273800 -> 273800 bytes {doc => upstream/doc}/org/img/measurements-t.png | Bin 56122 -> 56122 bytes {doc => upstream/doc}/org/img/measurements.png | Bin 221323 -> 221323 bytes {doc => upstream/doc}/org/img/mf-t.png | Bin 25473 -> 25473 bytes {doc => upstream/doc}/org/img/mf.png | Bin 119082 -> 119082 bytes .../org/img/overview-single-episode-with-uc-t.png | Bin 13947 -> 13947 bytes .../org/img/overview-single-episode-with-uc.png | Bin 18706 -> 18706 bytes {doc => upstream/doc}/org/img/sf-t.png | Bin 67024 -> 67024 bytes {doc => upstream/doc}/org/img/sf.png | Bin 408622 -> 408622 bytes {doc => upstream/doc}/org/mc.org | 0 {doc => upstream/doc}/org/model.org | 0 {doc => upstream/doc}/org/swu.org | 0 {doc => upstream/doc}/org/usage.org | 0 {man => upstream/man}/.gitignore | 0 {man => upstream/man}/agh-profile-gen.1.in | 0 {man => upstream/man}/aghermann.1.in | 0 {man => upstream/man}/edfcat.1.in | 0 {man => upstream/man}/edfhed-gtk.1.in | 0 {man => upstream/man}/edfhed.1.in | 0 upstream/src/Makefile.am | 87 ++++++++ {src => upstream/src}/aghermann/.gitignore | 0 {src => upstream/src}/aghermann/Makefile.am | 6 +- .../src}/aghermann/expdesign/Makefile.am | 15 +- .../src}/aghermann/expdesign/expdesign.cc | 52 ++++- .../src/aghermann/expdesign/expdesign.hh | 185 +--------------- .../src}/aghermann/expdesign/forward-decls.hh | 2 + .../src}/aghermann/expdesign/loadsave.cc | 3 +- .../src}/aghermann/expdesign/profile.hh | 0 .../src}/aghermann/expdesign/recording.cc | 6 +- .../src}/aghermann/expdesign/recording.hh | 0 .../src}/aghermann/expdesign/subject.cc | 23 +- upstream/src/aghermann/expdesign/subject.hh | 223 ++++++++++++++++++++ .../src}/aghermann/expdesign/tree-scanner.cc | 8 +- {src => upstream/src}/aghermann/globals.cc | 0 {src => upstream/src}/aghermann/globals.hh | 0 {src => upstream/src}/aghermann/ica/Makefile.am | 6 - {src => upstream/src}/aghermann/ica/ica.hh | 0 {src => upstream/src}/aghermann/main.cc | 2 +- {src => upstream/src}/aghermann/model/Makefile.am | 12 -- .../src}/aghermann/model/achermann-siman.cc | 0 .../src}/aghermann/model/achermann-tunable.cc | 2 - .../src}/aghermann/model/achermann-tunable.hh | 0 {src => upstream/src}/aghermann/model/achermann.cc | 45 ---- {src => upstream/src}/aghermann/model/achermann.hh | 0 {src => upstream/src}/aghermann/model/beersma.hh | 0 {src => upstream/src}/aghermann/model/borbely.cc | 0 .../src}/aghermann/model/forward-decls.hh | 0 .../src}/aghermann/model/ultradian-cycle.cc | 0 .../src}/aghermann/patterns/Makefile.am | 13 +- .../src}/aghermann/patterns/patterns.cc | 0 .../src}/aghermann/patterns/patterns.hh | 0 .../src}/aghermann/patterns/patterns.ii | 0 {src => upstream/src}/aghermann/print_version.cc | 0 {src => upstream/src}/aghermann/rk1968/Makefile.am | 9 - {src => upstream/src}/aghermann/rk1968/rk1968.cc | 7 +- {src => upstream/src}/aghermann/rk1968/rk1968.hh | 13 +- {src => upstream/src}/aghermann/ui/Makefile.am | 13 -- .../src}/aghermann/ui/forward-decls.hh | 0 {src => upstream/src}/aghermann/ui/globals.cc | 0 {src => upstream/src}/aghermann/ui/globals.hh | 0 {src => upstream/src}/aghermann/ui/mf/Makefile.am | 10 - .../src}/aghermann/ui/mf/mf-construct.cc | 0 {src => upstream/src}/aghermann/ui/mf/mf.cc | 0 {src => upstream/src}/aghermann/ui/mf/mf.hh | 0 {src => upstream/src}/aghermann/ui/mf/mf_cb.cc | 0 {src => upstream/src}/aghermann/ui/mf/mf_cb.hh | 0 {src => upstream/src}/aghermann/ui/misc.cc | 0 {src => upstream/src}/aghermann/ui/misc.hh | 0 {src => upstream/src}/aghermann/ui/mw/Makefile.am | 11 - {src => upstream/src}/aghermann/ui/mw/admit-one.cc | 0 .../src}/aghermann/ui/mw/admit-one_cb.cc | 0 {src => upstream/src}/aghermann/ui/mw/construct.cc | 0 {src => upstream/src}/aghermann/ui/mw/loadsave.cc | 0 .../src}/aghermann/ui/mw/mainmenu_cb.cc | 8 +- .../src}/aghermann/ui/mw/measurements.cc | 0 .../src}/aghermann/ui/mw/measurements_cb.cc | 2 +- {src => upstream/src}/aghermann/ui/mw/mw.cc | 2 +- {src => upstream/src}/aghermann/ui/mw/mw.hh | 16 +- {src => upstream/src}/aghermann/ui/mw/mw_cb.cc | 0 {src => upstream/src}/aghermann/ui/mw/mw_cb.hh | 0 {src => upstream/src}/aghermann/ui/mw/populate.cc | 2 +- .../src}/aghermann/ui/mw/settings_cb.cc | 0 .../src}/aghermann/ui/mw/simulations.cc | 0 .../src}/aghermann/ui/mw/simulations_cb.cc | 0 {src => upstream/src}/aghermann/ui/mw/splash.cc | 0 {src => upstream/src}/aghermann/ui/mw/widgets.hh | 0 {src => upstream/src}/aghermann/ui/sf/Makefile.am | 15 -- {src => upstream/src}/aghermann/ui/sf/channel.cc | 0 {src => upstream/src}/aghermann/ui/sf/construct.cc | 0 .../src}/aghermann/ui/sf/controls_cb.cc | 0 .../src}/aghermann/ui/sf/d/artifacts-construct.cc | 0 .../ui/sf/d/artifacts-simple-construct.cc | 0 .../src}/aghermann/ui/sf/d/artifacts-simple.cc | 0 .../src}/aghermann/ui/sf/d/artifacts-simple.hh | 0 .../src}/aghermann/ui/sf/d/artifacts.cc | 0 .../src}/aghermann/ui/sf/d/artifacts.hh | 0 .../src}/aghermann/ui/sf/d/artifacts_cb.cc | 0 .../src}/aghermann/ui/sf/d/filters-construct.cc | 0 {src => upstream/src}/aghermann/ui/sf/d/filters.cc | 0 {src => upstream/src}/aghermann/ui/sf/d/filters.hh | 0 .../src}/aghermann/ui/sf/d/filters_cb.cc | 0 .../src}/aghermann/ui/sf/d/patterns-construct.cc | 0 .../src}/aghermann/ui/sf/d/patterns-draw.cc | 0 .../src}/aghermann/ui/sf/d/patterns-profiles.cc | 0 .../src}/aghermann/ui/sf/d/patterns-profiles_cb.cc | 0 .../src}/aghermann/ui/sf/d/patterns.cc | 0 .../src}/aghermann/ui/sf/d/patterns.hh | 0 .../src}/aghermann/ui/sf/d/patterns_cb.cc | 0 .../src}/aghermann/ui/sf/d/phasediff-construct.cc | 0 .../src}/aghermann/ui/sf/d/phasediff.cc | 0 .../src}/aghermann/ui/sf/d/phasediff.hh | 0 .../src}/aghermann/ui/sf/d/phasediff_cb.cc | 0 .../src/aghermann/ui/sf/d/rk1968.hh | 29 ++- {src => upstream/src}/aghermann/ui/sf/hypnogram.cc | 0 .../src}/aghermann/ui/sf/hypnogram_cb.cc | 0 {src => upstream/src}/aghermann/ui/sf/ica.cc | 0 {src => upstream/src}/aghermann/ui/sf/ica_cb.cc | 0 .../src}/aghermann/ui/sf/mainmenu_cb.cc | 0 .../src}/aghermann/ui/sf/montage-overlays.cc | 0 {src => upstream/src}/aghermann/ui/sf/montage.cc | 0 .../src}/aghermann/ui/sf/montage_cb.cc | 0 {src => upstream/src}/aghermann/ui/sf/sf.cc | 0 {src => upstream/src}/aghermann/ui/sf/sf.hh | 8 +- {src => upstream/src}/aghermann/ui/sf/sf_cb.cc | 0 {src => upstream/src}/aghermann/ui/sf/sf_cb.hh | 0 {src => upstream/src}/aghermann/ui/sf/widgets.hh | 0 {src => upstream/src}/aghermann/ui/sm/Makefile.am | 9 - .../src}/aghermann/ui/sm/sm-construct.cc | 0 {src => upstream/src}/aghermann/ui/sm/sm.cc | 0 {src => upstream/src}/aghermann/ui/sm/sm.hh | 0 {src => upstream/src}/aghermann/ui/sm/sm_cb.cc | 0 {src => upstream/src}/aghermann/ui/sm/sm_cb.hh | 0 {src => upstream/src}/aghermann/ui/ui++.cc | 0 {src => upstream/src}/aghermann/ui/ui++.hh | 0 {src => upstream/src}/aghermann/ui/ui.cc | 6 +- {src => upstream/src}/aghermann/ui/ui.hh | 0 upstream/src/common/Makefile.am | 17 ++ {src => upstream/src}/common/alg.hh | 0 {src => upstream/src}/common/config-validate.hh | 0 {src => upstream/src}/common/containers.hh | 0 {src => upstream/src}/common/fs.hh | 0 {src => upstream/src}/common/lang.hh | 6 +- {src => upstream/src}/common/libcommon.cc | 3 +- {src => upstream/src}/common/string.hh | 0 {src => upstream/src}/common/subject_id.cc | 0 {src => upstream/src}/common/subject_id.hh | 0 {src => upstream/src}/libmetrics/Makefile.am | 15 -- {src => upstream/src}/libmetrics/all.hh | 0 {src => upstream/src}/libmetrics/bands.hh | 0 {src => upstream/src}/libmetrics/forward-decls.hh | 0 {src => upstream/src}/libmetrics/mc-artifacts.cc | 0 {src => upstream/src}/libmetrics/mc-artifacts.hh | 0 {src => upstream/src}/libmetrics/mc-artifacts.ii | 0 {src => upstream/src}/libmetrics/mc.cc | 0 {src => upstream/src}/libmetrics/mc.hh | 0 .../src}/libmetrics/page-metrics-base.cc | 0 .../src}/libmetrics/page-metrics-base.hh | 0 {src => upstream/src}/libmetrics/psd.cc | 1 - {src => upstream/src}/libmetrics/psd.hh | 0 {src => upstream/src}/libmetrics/swu.cc | 1 - {src => upstream/src}/libmetrics/swu.hh | 0 {src => upstream/src}/libsigfile/Makefile.am | 14 -- {src => upstream/src}/libsigfile/all.hh | 0 {src => upstream/src}/libsigfile/channel.cc | 0 {src => upstream/src}/libsigfile/channel.hh | 0 {src => upstream/src}/libsigfile/edf-file.xml | 0 {src => upstream/src}/libsigfile/edf-io.cc | 0 {src => upstream/src}/libsigfile/edf.cc | 101 +++++---- {src => upstream/src}/libsigfile/edf.hh | 0 {src => upstream/src}/libsigfile/forward-decls.hh | 0 {src => upstream/src}/libsigfile/page.cc | 0 {src => upstream/src}/libsigfile/page.hh | 0 {src => upstream/src}/libsigfile/source-base.cc | 10 +- {src => upstream/src}/libsigfile/source-base.hh | 0 {src => upstream/src}/libsigfile/tsv.cc | 2 +- {src => upstream/src}/libsigfile/tsv.hh | 0 {src => upstream/src}/libsigfile/typed-source.cc | 0 {src => upstream/src}/libsigfile/typed-source.hh | 0 {src => upstream/src}/libsigproc/Makefile.am | 18 +- {src => upstream/src}/libsigproc/exstrom.cc | 0 .../src}/libsigproc/exstrom.com/README | 0 .../src}/libsigproc/exstrom.com/bwbs.c | 0 .../src}/libsigproc/exstrom.com/liir.c | 0 {src => upstream/src}/libsigproc/exstrom.com/rdf.c | 0 {src => upstream/src}/libsigproc/exstrom.hh | 0 {src => upstream/src}/libsigproc/ext-filters.cc | 0 {src => upstream/src}/libsigproc/ext-filters.hh | 0 {src => upstream/src}/libsigproc/ext-filters.ii | 0 {src => upstream/src}/libsigproc/sigproc.cc | 0 {src => upstream/src}/libsigproc/sigproc.hh | 0 {src => upstream/src}/libsigproc/sigproc.ii | 0 {src => upstream/src}/libsigproc/winfun.cc | 0 {src => upstream/src}/libsigproc/winfun.hh | 0 {src => upstream/src}/tools/.gitignore | 0 {src => upstream/src}/tools/Makefile.am | 0 {src => upstream/src}/tools/agh-profile-gen.cc | 0 {src => upstream/src}/tools/edfcat.cc | 0 {src => upstream/src}/tools/edfhed-gtk.cc | 0 {src => upstream/src}/tools/edfhed.cc | 0 {src => upstream/src}/tools/plot-vaf | 0 250 files changed, 538 insertions(+), 650 deletions(-) -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
