Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Merge branch 'lwip_dev' into devel
authorLei Xia <lxia@northwestern.edu>
Mon, 6 Oct 2008 17:11:11 +0000 (12:11 -0500)
committerLei Xia <lxia@northwestern.edu>
Mon, 6 Oct 2008 17:11:11 +0000 (12:11 -0500)
commita1073097716c800734e117267ce7aa92aa0d9a17
treee6521049b30b189293c6906dfd6565ca2b270e75
parent819c31aa7157ed1e3e17b9f05bf74de38179233d
parent3fb8af7e2069d7517b5d6c4fb7dc04b22ddf8396
Merge branch 'lwip_dev' into devel

Conflicts:
palacios/build/Makefile
palacios/include/geekos/socket.h
palacios/src/geekos/net.c
25 files changed:
geekos/build/Makefile
geekos/include/geekos/int.h
geekos/include/geekos/ne2k.h
geekos/include/geekos/timer.h
geekos/include/libc/string.h
geekos/include/lwip/apps/ping.h
geekos/include/lwip/arch/cc.h
geekos/include/lwip/arch/perf.h
geekos/include/lwip/ipv4/lwip/ip_addr.h
geekos/include/lwip/lwip/opt.h
geekos/include/lwip/netif/ne2kif.h
geekos/include/uip/uip-conf.h
geekos/src/geekos/ne2k.c
geekos/src/geekos/net.c
geekos/src/geekos/socket.c
geekos/src/geekos/synch.c
geekos/src/geekos/timer.c
geekos/src/lwip/api/tcpip.c
geekos/src/lwip/apps/ping.c
geekos/src/lwip/arch/sys_arch.c
geekos/src/lwip/build/Makefile
geekos/src/lwip/core/init.c
geekos/src/lwip/netif/ne2kif.c
geekos/src/net/uip.c
palacios/build/Makefile