Commit Graph

2831 Commits

Author SHA1 Message Date
Harald Welte 29e9d97f19 Merge branch 'master' into sms 2009-08-08 16:04:57 +02:00
Harald Welte dd2573e87c Merge branch 'master' into sms 2009-08-07 00:33:03 +02:00
Harald Welte 6da4e86b2c Merge branch 'master' into sms 2009-08-06 19:20:22 +02:00
Harald Welte 4d62d79365 Merge branch 'master' into sms 2009-07-29 18:05:54 +02:00
Harald Welte 1639d72d32 Merge commit 'origin/master' 2009-07-29 10:58:08 +02:00
Harald Welte 086bed1968 Merge commit 'origin/master' into sms 2009-07-28 21:12:14 +02:00
Harald Welte 62590554d0 Merge commit 'origin/master' 2009-07-28 20:54:50 +02:00
Harald Welte ea1f6e8f2c Merge branch 'master' into sms 2009-07-28 18:40:45 +02:00
Harald Welte d3cf751987 Merge branch 'rtp_proxy' 2009-07-28 18:40:08 +02:00
Harald Welte a55b00d14c Merge branch 'master' into rtp_proxy 2009-07-28 08:21:40 +02:00
Harald Welte a0b8327e9d Merge branch 'master' into sms
Conflicts:
	openbsc/include/openbsc/transaction.h
	openbsc/src/gsm_04_11.c
	openbsc/src/transaction.c
2009-07-28 00:44:49 +02:00
Harald Welte 83cd1c4746 Merge branch 'master' into sms 2009-07-23 21:24:28 +02:00
Harald Welte f8fec5c3cb Merge branch 'master' into sms 2009-07-23 19:09:01 +02:00
Harald Welte a20ec9641e Merge branch 'master' into sms 2009-07-19 18:49:15 +02:00
Harald Welte e8c9d1f02b Merge branch 'master' into sms 2009-07-09 23:54:34 +02:00
Holger Hans Peter Freyther cccf475f07 Merge branch 'holger/ipacess' 2009-07-09 00:16:29 +02:00
Harald Welte 67791c3f33 Merge commit 'origin/master' 2009-07-05 14:19:06 +02:00
Harald Welte 8ae797a471 Merge branch 'master' into sms 2009-07-05 14:10:01 +02:00
Harald Welte 960572ded1 Merge branch 'master' into sms 2009-07-04 10:38:11 +02:00
Harald Welte 458aef8304 Merge branch 'master' into sms 2009-07-04 09:21:47 +02:00
Harald Welte 01307ec256 Merge branch 'master' into sms 2009-07-01 16:57:39 +02:00
Harald Welte 9a16e22e9b Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc 2009-07-01 11:24:18 +02:00
Harald Welte 8243f5cf9b Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc 2009-06-29 13:07:06 +02:00
Harald Welte e455b7b3dd Merge branch 'master' into sms
Conflicts:
	openbsc/include/openbsc/gsm_data.h
	openbsc/src/bsc_hack.c
	openbsc/src/vty_interface.c
2009-06-26 20:34:09 +02:00
Harald Welte 137e17a5fc Merge branch 'master' into talloc 2009-06-26 18:19:53 +02:00
Harald Welte 34794251fe Merge branch 'master' into talloc 2009-06-22 01:37:14 +02:00
Harald Welte edd6f0e9aa Merge branch 'mncc-harald' 2009-06-14 22:15:37 +08:00
Harald Welte 95aa665f87 Merge branch 'master' of gitosis@bs11-abis.gnumonks.org:openbsc 2009-06-14 22:15:32 +08:00
Harald Welte 3a0cb964ac Merge commit 'origin/master' into mncc-harald 2009-06-12 20:15:16 +08:00
Harald Welte 5923c2c456 Merge commit 'origin/master' 2009-06-10 23:21:25 +08:00
Harald Welte 947c6f81a5 initial commit of current OpenBSC state 2008-12-23 20:25:15 +00:00