diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-11-24 19:58:01 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2009-11-24 19:58:01 +0100 |
commit | 9de4a6daa948ce2631ae8aa7f1fa311428b2bc7a (patch) | |
tree | 5d74034d9c056dfceea6b3a80d87cb8fb6c0be6b /openbsc/tests/channel | |
parent | 851ace9f331a1488b51af6ce269794025fd1ff46 (diff) | |
parent | 2d501ea26a219176b1c556449e45ebd90d4accfb (diff) |
Merge branch 'master' into on-waves/bsc-master
Conflicts:
openbsc/src/abis_nm.c
openbsc/src/bsc_init.c
openbsc/src/vty_interface.c
Diffstat (limited to 'openbsc/tests/channel')
0 files changed, 0 insertions, 0 deletions