Merge branch 'master' into sms

Browse Source

Conflicts:
	openbsc/include/openbsc/gsm_data.h
	openbsc/src/bsc_hack.c
	openbsc/src/vty_interface.c

...

This commit is contained in:

Harald Welte 2009-06-26 20:34:09 +02:00

parent edd6f0e9aa 137e17a5fc

commit e455b7b3dd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available