commit | 53888bfd6c202ed084fe09919046fe7ba7eb0ae3 | [log] [tgz] |
---|---|---|
author | Harald Welte <laforge@gnumonks.org> | Fri Jun 26 20:34:09 2009 +0200 |
committer | Harald Welte <laforge@gnumonks.org> | Fri Jun 26 20:34:09 2009 +0200 |
tree | f10f0c7cb2558778fdd033c288620e409d1f6fe9 | |
parent | 8ddb2cc8e210c17d8fef8a9bf0abfcd1daf76975 [diff] | |
parent | 6bfda782b9cc30b5c10ad0290949c6d25d4c83cf [diff] |
Merge branch 'master' into sms Conflicts: openbsc/include/openbsc/gsm_data.h openbsc/src/bsc_hack.c openbsc/src/vty_interface.c