Merge commit '4d3a7b124e08a597d5f01fb2a71f3a4677a360a9'
authorHarald Welte <laforge@gnumonks.org>
Fri, 27 May 2011 16:17:05 +0000 (18:17 +0200)
committerHarald Welte <laforge@gnumonks.org>
Fri, 27 May 2011 16:17:05 +0000 (18:17 +0200)
commit783730eae1cc9eb35f410d1be8f5fb93a1ec6423
tree3a1ea93ad0cb9bc498bebb57f6480be72ee4c608
parentd76345aefa34c576dd142eb64cb0f765cda22933
parent4d3a7b124e08a597d5f01fb2a71f3a4677a360a9
Merge commit '4d3a7b124e08a597d5f01fb2a71f3a4677a360a9'
src/shared/libosmocore/configure.ac
src/shared/libosmocore/include/osmocom/gsm/Makefile.am
src/shared/libosmocore/include/osmocom/gsm/abis_nm.h
src/shared/libosmocore/include/osmocom/gsm/gsm_utils.h
src/shared/libosmocore/include/osmocom/gsm/protocol/gsm_04_08.h
src/shared/libosmocore/include/osmocom/gsm/sysinfo.h
src/shared/libosmocore/src/gsm/Makefile.am
src/shared/libosmocore/src/gsm/abis_nm.c
src/shared/libosmocore/src/gsm/sysinfo.c
src/shared/libosmocore/src/socket.c