[hurd] 03/03: Merge branch 'dde-upstream' into dde

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch dde
in repository hurd.

commit deb7a473c352b5387f79063da1125936b64172d3
Merge: bb5b4b9 d4fa1e5
Author: Samuel Thibault <address@hidden>
Date:   Mon Jan 13 22:49:09 2014 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        Makefile
        NEWS
        TODO
        config.make.in
        configure.ac
        console-client/Makefile
        console-client/console.c
        console-client/pc-kbd.c
        console-client/pc-mouse.c
        console-client/vga-dynafont.c
        console-client/xkb/kstoucs.c
        console/pager.c
        daemons/console-run.c
        daemons/runsystem.sh
        doc/hurd.texi
        doc/navigating
        exec/Makefile
        exec/exec.c
        exec/hostarch.c
        exec/main.c
        exec/priv.h
        ext2fs/balloc.c
        ext2fs/dir.c
        ext2fs/ext2fs.c
        ext2fs/ext2fs.h
        ext2fs/getblk.c
        ext2fs/hyper.c
        ext2fs/ialloc.c
        ext2fs/inode.c
        ext2fs/pager.c
        ext2fs/pokel.c
        ext2fs/truncate.c
        fatfs/pager.c
        hurd/fsys.defs
        hurd/fsys_reply.defs
        hurd/process.defs
        hurd/process_reply.defs
        hurd/process_request.defs
        include/pids.h
        init/init.c
        isofs/inode.c
        isofs/lookup.c
        isofs/pager.c
        libdiskfs/Makefile
        libdiskfs/boot-start.c
        libdiskfs/dead-name.c
        libdiskfs/dir-lookup.c
        libdiskfs/dir-renamed.c
        libdiskfs/disk-pager.c
        libdiskfs/diskfs-pager.h
        libdiskfs/diskfs.h
        libdiskfs/file-set-trans.c
        libdiskfs/fsys-getroot.c
        libdiskfs/init-startup.c
        libdiskfs/peropen-make.c
        libdiskfs/peropen-rele.c
        libfshelp/Makefile
        libfshelp/fshelp.h
        libfshelp/set-options.c
        libihash/ihash.h
        libiohelp/iouser-create.c
        libnetfs/Makefile
        libnetfs/dir-lookup.c
        libnetfs/file-get-translator.c
        libnetfs/file-set-translator.c
        libnetfs/fsstubs.c
        libnetfs/fsys-getroot.c
        libnetfs/init-startup.c
        libnetfs/make-peropen.c
        libnetfs/netfs.h
        libnetfs/release-peropen.c
        libpager/data-request.c
        libpager/data-return.c
        libpager/pager-create.c
        libpager/pager.h
        libpager/priv.h
        libpipe/pipe.c
        libps/write.c
        libshouldbeinlibc/Makefile
        libstore/Makefile
        libstore/crypt.h
        libstore/do-bunzip2.c
        libstore/gzip.h
        libstore/inflate.c
        libstore/tailor.h
        libstore/unzip.c
        libstore/util.c
        libtrivfs/Makefile
        libtrivfs/io-restrict-auth.c
        libtrivfs/startup.c
        libtrivfs/trivfs.h
        mach-defpager/main.c
        pfinet/linux-src/net/ipv4/ipmr.c
        pfinet/main.c
        pfinet/tunnel.c
        pflocal/io.c
        pflocal/sock.c
        pflocal/sock.h
        pflocal/socket.c
        proc/info.c
        proc/main.c
        proc/mgt.c
        proc/pgrp.c
        proc/proc.h
        storeio/pager.c
        sutils/MAKEDEV.sh
        sutils/fstab.c
        sutils/swapon.c
        term/hurdio.c
        term/users.c
        tmpfs/pager-stubs.c
        tmpfs/tmpfs.c
        trans/Makefile
        trans/null.c
        trans/symlink.c
        utils/Makefile
        utils/fakeroot.sh
        utils/mount.c
        utils/remap.sh
        utils/rpctrace.c


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git