Merge commit '33cb71ac91fb870702dbb71595dba4a554001e3c'
authorHarald Welte <laforge@gnumonks.org>
Sun, 22 May 2011 10:07:37 +0000 (12:07 +0200)
committerHarald Welte <laforge@gnumonks.org>
Sun, 22 May 2011 10:07:37 +0000 (12:07 +0200)
commit393ddf9e79c47878e53a318f69e18a36c317bab0
tree3632c855f475275a37f84a630a5afeb988bb1be6
parent63cca6660f16c76936a8b17502c3de6b7050ad61
parent33cb71ac91fb870702dbb71595dba4a554001e3c
Merge commit '33cb71ac91fb870702dbb71595dba4a554001e3c'
src/shared/libosmocore/include/osmocom/core/Makefile.am
src/shared/libosmocore/include/osmocom/core/gsmtap_util.h
src/shared/libosmocore/include/osmocom/core/socket.h
src/shared/libosmocore/src/Makefile.am
src/shared/libosmocore/src/gsmtap_util.c
src/shared/libosmocore/src/logging.c
src/shared/libosmocore/src/socket.c