diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:37 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:45 +0100 |
| commit | 3af86269a9077978641aea2f7ef544ffef00ef8e (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | 8b6140c4d372f3cf6e65bb0a938f55ed752b54cb (diff) | |
| parent | ffecf66fc15b613de6f3f5fea98dd203c3bf2744 (diff) | |
Merge remote branch 'origin/master' into on-waves/mgcp
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/src/Makefile.am
0 files changed, 0 insertions, 0 deletions