[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Merge branch 'dde-upstream' into eth
|
From: |
Samuel Thibault |
|
Subject: |
[hurd] 01/01: Merge branch 'dde-upstream' into eth |
|
Date: |
Mon, 09 Feb 2015 09:59:06 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to annotated tag upstream/eth/0.5.git20150208
in repository hurd.
commit 046590050422ce47628e54826776142ecdb66aee
Merge: 99d5e7b db74da9
Author: Samuel Thibault <address@hidden>
Date: Sun Feb 8 23:54:12 2015 +0000
Merge branch 'dde-upstream' into eth
Conflicts:
devnode/Makefile
devnode/mig-mutate.h
libmachdev/Makefile
libmachdev/block.c
libmachdev/mig-decls.h
libmachdev/mig-mutate.h
eth-filter/mig-decls.h | 6 ++++++
eth-filter/mig-mutate.h | 4 ++++
eth-multiplexer/Makefile | 1 +
eth-multiplexer/mig-decls.h | 6 ++++++
eth-multiplexer/mig-mutate.h | 4 ++++
5 files changed, 21 insertions(+)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git