Holger Hans Peter Freyther 1ebad74377 Merge remote branch 'origin/master' into on-waves/mgcp ... Conflicts: openbsc/include/openbsc/Makefile.am openbsc/src/Makefile.am		2010-02-26 20:16:45 +01:00
..
mgcp_main.c	Merge remote branch 'origin/master' into on-waves/mgcp	2010-02-26 20:16:45 +01:00
mgcp_network.c	Merge remote branch 'origin/master' into on-waves/mgcp	2010-02-26 20:16:45 +01:00
mgcp_protocol.c	Merge remote branch 'origin/master' into on-waves/mgcp	2010-02-26 20:16:45 +01:00
mgcp_vty.c	Merge remote branch 'origin/master' into on-waves/mgcp	2010-02-26 20:16:45 +01:00