| commit | 1ebad7437729d6abbf5308de19161b0574e3451a | [log] [tgz] |
|---|---|---|
| author | Holger Hans Peter Freyther <zecke@selfish.org> | Fri Feb 26 20:16:37 2010 +0100 |
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | Fri Feb 26 20:16:45 2010 +0100 |
| tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 | |
| parent | 36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f [diff] | |
| parent | 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c [diff] |
Merge remote branch 'origin/master' into on-waves/mgcp Conflicts: openbsc/include/openbsc/Makefile.am openbsc/src/Makefile.am