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/tests/Makefile.am | |
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/tests/Makefile.am')
-rw-r--r-- | openbsc/tests/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am index f40105fbf..3b1b93120 100644 --- a/openbsc/tests/Makefile.am +++ b/openbsc/tests/Makefile.am @@ -1 +1 @@ -SUBDIRS = debug timer sms gsm0408 db channel sccp +SUBDIRS = debug gsm0408 db channel sccp |