This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository mialmpick.
commit a1b1f9594d9d03a115d58c64cec4c9667634f3a0 Merge: a441f41 2312548 Author: Gert Wollny <[email protected]> Date: Fri Jan 8 15:28:47 2016 +0100 resolve merge conflicts ChangeLog | 5 + Makefile.in | 158 +++++------ aclocal.m4 | 757 +++++++++++++++++++++++++++++----------------------- config.guess | 283 +++++++------------- config.h.in | 4 +- config.sub | 78 ++++-- configure | 499 ++++++++++++++++++++-------------- configure.ac | 2 +- depcomp | 89 +----- macros/Makefile.in | 10 +- missing | 99 +++---- pixmaps/Makefile.in | 10 +- po/de.gmo | Bin 4374 -> 4374 bytes po/de.po | 2 +- po/mialmpick.pot | 4 +- src/Makefile.am | 2 +- src/Makefile.in | 32 +-- src/glvolume.c | 10 +- src/load_vista.c | 14 +- src/main.c | 11 +- 20 files changed, 1056 insertions(+), 1013 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mialmpick.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
