commit | 5b359d81fbfb2bb5894d70e55cec7f2709c8af9f | [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 | b78996de70be6939a94ee4125eee144884674e49 [diff] | |
parent | 932e20d3ac37db31c4e7043c69e47e8b1f2b2098 [diff] |
Merge branch 'master' into sms Conflicts: openbsc/include/openbsc/transaction.h openbsc/src/gsm_04_11.c openbsc/src/transaction.c