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 | 1ebad7437729d6abbf5308de19161b0574e3451a (patch) | |
| tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 /openbsc/src/mgcp/mgcp_main.c | |
| 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
Diffstat (limited to 'openbsc/src/mgcp/mgcp_main.c')
| -rw-r--r-- | openbsc/src/mgcp/mgcp_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/mgcp/mgcp_main.c index 32abef2c6..cea0ba427 100644 --- a/openbsc/src/mgcp/mgcp_main.c +++ b/openbsc/src/mgcp/mgcp_main.c @@ -33,10 +33,10 @@ #include <sys/socket.h> #include <openbsc/debug.h> -#include <openbsc/msgb.h> -#include <openbsc/talloc.h> +#include <osmocore/msgb.h> +#include <osmocore/talloc.h> #include <openbsc/gsm_data.h> -#include <openbsc/select.h> +#include <osmocore/select.h> #include <openbsc/mgcp.h> #include <openbsc/telnet_interface.h> |