diff options
author | Harald Welte <laforge@gnumonks.org> | 2010-03-25 12:18:14 +0800 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2010-03-25 12:18:14 +0800 |
commit | 692df15c8194cd98cbb4d89465ae707ba30bb9b6 (patch) | |
tree | e5de2221ffddfbe5b1b0bf5abab4ae7d803b8228 /src/shared/libosmocore/m4 | |
parent | 3533cd39b106122e58d72e9e0240ab25fab90bc8 (diff) | |
parent | 52b4abdcb351830f5493a50c4181ef3947f3feab (diff) |
Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'
Conflicts:
src/shared/libosmocore/src/utils.c
Diffstat (limited to 'src/shared/libosmocore/m4')
-rw-r--r-- | src/shared/libosmocore/m4/DUMMY | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/libosmocore/m4/DUMMY b/src/shared/libosmocore/m4/DUMMY new file mode 100644 index 00000000..fda557ad --- /dev/null +++ b/src/shared/libosmocore/m4/DUMMY @@ -0,0 +1 @@ +Dummply placeholder. |