[lwip-commits] [SCM] UNNAMED PROJECT branch, master, updated. 2dab478c3f04b7b8be17f3cd700027244fecefac

[Simon Goldschmidt]

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 "UNNAMED PROJECT".

The branch, master has been updated
       via  2dab478c3f04b7b8be17f3cd700027244fecefac (commit)
       via  a32afb28c05b5483eb7a3383b3cd78f3adb942d1 (commit)
       via  d2a89b424b28fad573a7a69b3af6fb0a3502a084 (commit)
      from  cd02450095e0d8e5574bd4490ceff27566229212 (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 2dab478c3f04b7b8be17f3cd700027244fecefac
Merge: a32afb2 cd02450
Author: Simon Goldschmidt <address@hidden>
Date:   Fri Feb 7 09:40:10 2014 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/lwip
    
    Conflicts:
        src/core/tcp_out.c
        src/include/ipv4/lwip/ip4_addr.h

commit a32afb28c05b5483eb7a3383b3cd78f3adb942d1
Author: Simon Goldschmidt <address@hidden>
Date:   Fri Feb 7 09:36:03 2014 +0100

    Added .gitattributes to normalize CRLF

commit d2a89b424b28fad573a7a69b3af6fb0a3502a084
Author: Simon Goldschmidt <address@hidden>
Date:   Thu Feb 6 22:34:06 2014 +0100

    patch #6537/#7858: TCP window scaling support (OOS queueing still needs 
special handling)

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

Summary of changes:
 .gitattributes              |    4 +
 CHANGELOG                   |    3 +
 src/core/init.c             |   17 +-
 src/core/tcp.c              |   21 +-
 src/core/tcp_in.c           |   69 ++-
 src/core/tcp_out.c          |   63 +++-
 src/include/lwip/opt.h      |   13 +
 src/include/lwip/tcp.h      |   54 ++-
 src/include/lwip/tcp_impl.h | 1038 ++++++++++++++++++++++---------------------
 9 files changed, 715 insertions(+), 567 deletions(-)
 create mode 100644 .gitattributes


hooks/post-receive
-- 
UNNAMED PROJECT