diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-06-25 02:55:59 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-06-25 02:58:15 +0200 |
| commit | f0e18a70586ad265edb81855f6e3cd6f784b89df (patch) | |
| tree | 40dba6a4814fcef3218395c42a0c71d05c00b5c4 /src/shared/libosmocore/include/Makefile.am | |
| parent | bc860c43c291304866cc6fc5ca9acc9499853d06 (diff) | |
| parent | 816e24cb4296d6b7110da4a89661bbac8dc7af21 (diff) | |
Merge commit '816e24cb4296d6b7110da4a89661bbac8dc7af21' into libosmocore
Conflicts:
src/shared/libosmocore/include/osmocore/protocol/gsm_04_08.h
Diffstat (limited to 'src/shared/libosmocore/include/Makefile.am')
| -rw-r--r-- | src/shared/libosmocore/include/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/libosmocore/include/Makefile.am b/src/shared/libosmocore/include/Makefile.am index f0015d5f..185c6968 100644 --- a/src/shared/libosmocore/include/Makefile.am +++ b/src/shared/libosmocore/include/Makefile.am @@ -1 +1 @@ -SUBDIRS = osmocore +SUBDIRS = osmocom osmocore |