| commit | 3366a94d6c3cd28c71bf76133a3ead3212fd04f1 | [log] [tgz] |
|---|---|---|
| author | Harald Welte <laforge@gnumonks.org> | Tue Jul 28 00:44:49 2009 +0200 |
| committer | Harald Welte <laforge@gnumonks.org> | Tue Jul 28 00:44:49 2009 +0200 |
| tree | 6423887a7c52271cce815c8864b51791a4e32410 | |
| parent | f3efc597d162e6e5f80e926c992dafe4e9f7dfc6 [diff] | |
| parent | 7bfc26749662e3a3227037cce4a24748343b50be [diff] |
Merge branch 'master' into sms Conflicts: openbsc/include/openbsc/transaction.h openbsc/src/gsm_04_11.c openbsc/src/transaction.c