Merge commit '3036612d59a5c8d97b2086a5e7817613f45948ef'
authorHarald Welte <laforge@gnumonks.org>
Mon, 23 May 2011 20:17:26 +0000 (22:17 +0200)
committerHarald Welte <laforge@gnumonks.org>
Mon, 23 May 2011 20:17:26 +0000 (22:17 +0200)
commitd76345aefa34c576dd142eb64cb0f765cda22933
tree6a08f29e160aea04859d9953dd4db2fc7696271f
parent308f9e506e6ae2f30a4b49895f80aa26605e50c0
parent3036612d59a5c8d97b2086a5e7817613f45948ef
Merge commit '3036612d59a5c8d97b2086a5e7817613f45948ef'
src/shared/libosmocore/include/osmocom/core/socket.h
src/shared/libosmocore/include/osmocom/gsm/Makefile.am
src/shared/libosmocore/include/osmocom/gsm/abis_nm.h
src/shared/libosmocore/include/osmocom/gsm/protocol/Makefile.am
src/shared/libosmocore/include/osmocom/gsm/protocol/ipaccess.h
src/shared/libosmocore/src/gsm/Makefile.am
src/shared/libosmocore/src/gsm/abis_nm.c
src/shared/libosmocore/src/gsmtap_util.c
src/shared/libosmocore/src/socket.c
src/shared/libosmocore/src/vty/telnet_interface.c