[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] the great next stuff branch, dde-debian, updated. a3f9aea41abcfe2f
From: |
Samuel Thibault |
Subject: |
[SCM] the great next stuff branch, dde-debian, updated. a3f9aea41abcfe2fb9c1646e18edb1af35a15c3b |
Date: |
Sun, 25 May 2014 14:57:14 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "the great next stuff".
The branch, dde-debian has been updated
via a3f9aea41abcfe2fb9c1646e18edb1af35a15c3b (commit)
via 7f581f1c9093a70145bd29752136f02fe96ef34a (commit)
via dc7e40fa2b4abb76ae2a2c4fdf100e0a5f005aea (commit)
via 2eeea189af278a62c7ae4e492b6f404ecb95fc29 (commit)
via 1e5ddee826d033731b190ea2ff01bbf8a086d547 (commit)
via ce9516b1dc45fbcd7e03680f6b1173208d79cc82 (commit)
via dcb434daad5e715e453370e5b802d58c02f7e3de (commit)
via 339d3c27837ef4a220ea4f843cfa0ad1cbd2571b (commit)
via 60735c6c8b1382518db01ca7d416113b03bb837b (commit)
via 8ca14292386a51b592a933af7453d78366540e14 (commit)
via f24cfd85037c2bf4d1c49fde8efe9038064b0e5c (commit)
via 6ef14d2991c03e2765b301bbba16651f6a2910e9 (commit)
via 3f838a20e1544ad321ecda9ff4adee3f5aad9d62 (commit)
via 6820a01ddfb7c7598e4efd8d602fc7039b5c5ea5 (commit)
via 743bd6614e8e4bacbcf296fd34c2df9a215fc1f5 (commit)
via d193d3e8e829b94c5cbe7c4725a7b125362f0840 (commit)
via 6a290fc0e45a4f3def38903c65759b3caf46ee80 (commit)
via 50df22e1228ef447bc5b44b9aaf9144f2d37dfd0 (commit)
via ec0dc548abbcf5df9b3a3e05d9cdfcec8c04fe77 (commit)
via 44fe26dd12b388d4b2035a345df54ef806bb956b (commit)
via dc2f85bef2999c94bafc9f21abcc60436f7ad129 (commit)
via af547d8a536cc3c7ffaf781ef04a580e987a72c7 (commit)
via e9ad61281761eaa485611578ac8ed71480e73eed (commit)
via 1de3e6d13cae11c714e603dc19213bbae3cf67e9 (commit)
via 1eabe09c011e133d1cb3750f10a76cd0924f88b7 (commit)
from deb7a473c352b5387f79063da1125936b64172d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a3f9aea41abcfe2fb9c1646e18edb1af35a15c3b
Merge: deb7a47 7f581f1
Author: Samuel Thibault <address@hidden>
Date: Sun May 25 14:57:05 2014 +0000
Merge branch 'dde-upstream' into dde
Conflicts:
boot-proxy-exc/Makefile
eth-filter.multi-thread/Makefile
eth-filter/Makefile
eth-filter/filter.c
eth-multiplexer/Makefile
eth-multiplexer/device_impl.c
eth-multiplexer/multiplexer.c
eth-multiplexer/notify_impl.c
libmachdev/device.defs
proc_proxy/Makefile
commit 7f581f1c9093a70145bd29752136f02fe96ef34a
Merge: d4fa1e5 dc7e40f
Author: Samuel Thibault <address@hidden>
Date: Sun May 25 14:55:43 2014 +0000
Merge remote-tracking branch 'incubator/dde' into dde-upstream
-----------------------------------------------------------------------
Summary of changes:
devnode/Makefile | 7 +-
devnode/devnode.c | 36 ++-
devnode/mig-mutate.h | 25 ++
libmachdev/Makefile | 38 ---
libmachdev/block.c | 313 --------------------
libmachdev/dev_hdr.h | 133 ---------
libmachdev/device_emul.h | 65 -----
libmachdev/ds_routines.c | 482 -------------------------------
libmachdev/ds_routines.h | 55 ----
libmachdev/errno-base.h | 39 ---
libmachdev/if_ether.h | 87 ------
libmachdev/if_hdr.h | 165 -----------
libmachdev/io_req.h | 135 ---------
libmachdev/linux-errno.h | 109 -------
libmachdev/mach_glue.h | 41 ---
libmachdev/machdev.h | 33 ---
libmachdev/misc.c | 50 ----
libmachdev/net.c | 674 --------------------------------------------
libmachdev/queue.c | 131 ---------
libmachdev/queue.h | 370 ------------------------
libmachdev/trivfs_server.c | 164 -----------
libmachdev/util.h | 35 ---
libmachdev/vm_param.h | 7 -
23 files changed, 49 insertions(+), 3145 deletions(-)
create mode 100644 devnode/mig-mutate.h
delete mode 100644 libmachdev/Makefile
delete mode 100644 libmachdev/block.c
delete mode 100644 libmachdev/dev_hdr.h
delete mode 100644 libmachdev/device_emul.h
delete mode 100644 libmachdev/ds_routines.c
delete mode 100644 libmachdev/ds_routines.h
delete mode 100644 libmachdev/errno-base.h
delete mode 100644 libmachdev/if_ether.h
delete mode 100644 libmachdev/if_hdr.h
delete mode 100644 libmachdev/io_req.h
delete mode 100644 libmachdev/linux-errno.h
delete mode 100644 libmachdev/mach_glue.h
delete mode 100644 libmachdev/machdev.h
delete mode 100644 libmachdev/misc.c
delete mode 100644 libmachdev/net.c
delete mode 100644 libmachdev/queue.c
delete mode 100644 libmachdev/queue.h
delete mode 100644 libmachdev/trivfs_server.c
delete mode 100644 libmachdev/util.h
delete mode 100644 libmachdev/vm_param.h
hooks/post-receive
--
the great next stuff
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] the great next stuff branch, dde-debian, updated. a3f9aea41abcfe2fb9c1646e18edb1af35a15c3b,
Samuel Thibault <=