commit | 3c5cb256c2937d3671fda0daeb2c324105b0627c | [log] [tgz] |
---|---|---|
author | Harald Welte <laforge@gnumonks.org> | Sat Aug 08 16:08:54 2009 +0200 |
committer | Harald Welte <laforge@gnumonks.org> | Sat Aug 08 16:08:54 2009 +0200 |
tree | 0f8bad6211e80ab17ef425b8d35107c6d6704028 | |
parent | a08a9acdb6bff0ee4fdf0f58b78b6525017a1f9f [diff] | |
parent | dc2c029098b7d1f216b2dc2654bd43253731b228 [diff] |
Merge branch 'master' into config_file Conflicts: openbsc/src/vty_interface.c