diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-02-20 22:08:33 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-02-20 22:08:33 +0100 |
| commit | fb29236bf45b3794742d50227ef0ffca75e29ac3 (patch) | |
| tree | 0c6cf8995d88b42dae5c1829659474d53d891409 /src/shared | |
| parent | 4eacd8cedbadd1e23605e9803900effc844ead14 (diff) | |
| parent | e94ad58e8e9515c4e5bddbb64f7333cacb26353e (diff) | |
Merge commit 'e94ad58e8e9515c4e5bddbb64f7333cacb26353e' into subtree-test1
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/libosmocore/tests/timer/timer_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/libosmocore/tests/timer/timer_test.c b/src/shared/libosmocore/tests/timer/timer_test.c index f1b4ad7f..3b441550 100644 --- a/src/shared/libosmocore/tests/timer/timer_test.c +++ b/src/shared/libosmocore/tests/timer/timer_test.c @@ -23,7 +23,7 @@ #include <osmocore/timer.h> #include <osmocore/select.h> -#include "../config.h" +#include "../../config.h" static void timer_fired(unsigned long data); |