diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-07-28 00:44:49 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-07-28 00:44:49 +0200 |
| commit | a0b8327e9da7ce47a4c2b1544b87c19a89769b05 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | 83cd1c4746bdd40c619e8c95e97ba0beeb081237 (diff) | |
| parent | cccf475f07d853be742a62f28e24556dce479fce (diff) | |
Merge branch 'master' into sms
Conflicts:
openbsc/include/openbsc/transaction.h
openbsc/src/gsm_04_11.c
openbsc/src/transaction.c
0 files changed, 0 insertions, 0 deletions