diff options
author | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-03-31 16:14:13 +0200 |
---|---|---|
committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2016-03-31 16:14:13 +0200 |
commit | b70dfa610d89786aa72a4adb4ffc1ba27a5f8af4 (patch) | |
tree | 46b8ad0e9463c83b3a36344dc0ae050adc6ed358 /openbsc/src/libcommon/Makefile.am | |
parent | 4b940126a3132ac6d6da4194229f2b8cb642c2ec (diff) | |
parent | cf1302e4cb4875816615a23e5d7e2e9f7bcb5bca (diff) |
Merge branch 'master' into sysmocom/iu
Conflicts:
openbsc/src/libmsc/auth.c
openbsc/src/libmsc/gsm_04_08.c
openbsc/src/osmo-bsc/osmo_bsc_vty.c
openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/src/libcommon/Makefile.am')
0 files changed, 0 insertions, 0 deletions