diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-06-26 20:34:09 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-06-26 20:34:09 +0200 |
| commit | e455b7b3ddd875f49737b4b808d3da5c395e8fa2 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | edd6f0e9aa086e32802ff5fd4dbe419f8dc34927 (diff) | |
| parent | 137e17a5fc85e3c8ae9b9b7fe7e2bc4322f3f384 (diff) | |
Merge branch 'master' into sms
Conflicts:
openbsc/include/openbsc/gsm_data.h
openbsc/src/bsc_hack.c
openbsc/src/vty_interface.c
0 files changed, 0 insertions, 0 deletions