Merge commit '620f7ab35034f78f894319e027a151568c331eea'
authorSylvain Munaut <tnt@246tNt.com>
Sat, 25 Jun 2011 20:26:49 +0000 (22:26 +0200)
committerSylvain Munaut <tnt@246tNt.com>
Sat, 25 Jun 2011 20:26:49 +0000 (22:26 +0200)
commit9be610aaba9e53ac53dff61281987d2488a7c95f
tree004b5feff78d7650dc413dd33a23aa0910a61d4f
parent4a8fb6111b467c88c3c59f1aa9caffddad697366
parent620f7ab35034f78f894319e027a151568c331eea
Merge commit '620f7ab35034f78f894319e027a151568c331eea'
13 files changed:
src/shared/libosmocore/include/osmocom/core/Makefile.am
src/shared/libosmocore/include/osmocom/core/prim.h
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/prim.h
src/shared/libosmocore/include/osmocom/gsm/protocol/gsm_08_58.h
src/shared/libosmocore/include/osmocom/gsm/rsl.h
src/shared/libosmocore/include/osmocom/gsm/sysinfo.h
src/shared/libosmocore/src/gsm/rsl.c
src/shared/libosmocore/src/gsm/sysinfo.c
src/shared/libosmocore/src/gsmtap_util.c
src/shared/libosmocore/src/socket.c