| commit | 6c45f2e325acde97f7b20d704b867bb55a2634c3 | [log] [tgz] |
|---|---|---|
| author | Holger Hans Peter Freyther <zecke@selfish.org> | Tue Jun 15 19:06:18 2010 +0800 |
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | Tue Jun 15 20:24:07 2010 +0800 |
| tree | 3bcd25bc4875a93e4120512879dc782cb0eb41bd | |
| parent | aad68b5ef8ca6c6e9e932fca0a3e7ef68f0e050d [diff] [blame] |
nat: Redo a merge with master that happend at this time.
diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/nat/bsc_nat_vty.c index 24ef398..5430670 100644 --- a/openbsc/src/nat/bsc_nat_vty.c +++ b/openbsc/src/nat/bsc_nat_vty.c
@@ -25,7 +25,8 @@ #include <openbsc/bsc_nat.h> #include <openbsc/gsm_04_08.h> -#include <openbsc/talloc.h> + +#include <osmocore/talloc.h> #include <sccp/sccp.h>