[SCM] the great next stuff branch, dde-debian, updated. 4964b2a81c26b5b48ea84dc1e4c6db7608d05ce9

[Samuel Thibault]

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  4964b2a81c26b5b48ea84dc1e4c6db7608d05ce9 (commit)
       via  db74da991825ad67c130414df9f77400c1166a31 (commit)
       via  a11f957fac1a2eec5f01bf428a984918eceee741 (commit)
       via  223f550c3ec58eaaae66347e8248832201b02ec0 (commit)
       via  d05316fcf34ad5d68cfe5a18633ec46352d3a399 (commit)
       via  4e5c7cd51cd148f7e92bc2fe2106283a05aa9065 (commit)
       via  a7565c0a2af347e2fe61ac0dc2ccd1b1a154990a (commit)
       via  e0303af66865ccf6ea1c336eaef55c64f61e9782 (commit)
       via  406ae6a6bfb896e38ab154aee253fac97ae1a11b (commit)
      from  723ff433520cdb9e3ce37bf8e8d214e21e2936a8 (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 4964b2a81c26b5b48ea84dc1e4c6db7608d05ce9
Merge: 723ff43 db74da9
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 8 23:53:32 2015 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        eth-filter/mig-decls.h
        eth-filter/mig-mutate.h
        eth-multiplexer/Makefile
        eth-multiplexer/mig-decls.h
        eth-multiplexer/mig-mutate.h

commit db74da991825ad67c130414df9f77400c1166a31
Merge: 852f723 a11f957
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 8 23:52:30 2015 +0000

    Merge remote-tracking branch 'incubator/dde' into dde-upstream

-----------------------------------------------------------------------

Summary of changes:
 devnode/Makefile        |    1 +
 devnode/mig-mutate.h    |    2 ++
 libmachdev/Makefile     |    6 ++++--
 libmachdev/block.c      |    4 ++--
 libmachdev/mig-decls.h  |    6 ++++++
 libmachdev/mig-mutate.h |    4 ++++
 6 files changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
the great next stuff