osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 1
Code Issues Releases Wiki Activity
264 Commits 84 Branches 105 Tags 49 MiB
Commit Graph

264 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther 56c5d2b39c Merge branch 'on-waves/mgcp' 2010-02-03 18:11:22 +01:00
Harald Welte 8b6140c4d3 Merge remote branch 'goeller/master' 2010-01-12 10:46:03 +01:00
Holger Hans Peter Freyther 99e7208f6d Merge branch 'on-waves/mgcp' 2010-01-11 17:10:19 +01:00
Harald Welte 3c4794d067 Merge remote branch 'origin/master' 2009-12-24 09:38:38 +01:00
Harald Welte 4e9ad43e58 Merge remote branch 'origin/master' 2009-12-12 14:11:09 +01:00
Holger Hans Peter Freyther d299ed6d0e Merge branch 'on-waves/mgcp' 2009-11-20 14:12:12 +01:00
Holger Hans Peter Freyther ba8c295f00 Merge branch 'on-waves/sccp' 2009-11-20 13:14:54 +01:00
Harald Welte 50f37b1237 Merge remote branch 'origin/master' 2009-11-18 09:23:11 +01:00
Harald Welte 871cf89a8e Merge remote branch 'origin/master' 2009-10-30 09:18:31 +01:00
Holger Hans Peter Freyther e097d2087b Merge branch 'holger/merge-on-waves-msc' 2009-10-30 08:20:16 +01:00
Holger Hans Peter Freyther 4194ae2684 Merge branch 'holger/merge-on-waves-msc' 2009-10-27 09:41:24 +01:00
Harald Welte 0e532f4638 Merge remote branch 'origin/master' 2009-10-26 20:12:07 +01:00
Harald Welte aa0ddbbf44 Merge remote branch 'origin/master' 2009-10-21 20:24:09 +02:00
Holger Hans Peter Freyther 88fc6496bd Merge branch 'holger/merge-on-waves-msc' 2009-10-21 16:38:37 +02:00
Holger Hans Peter Freyther 5ce5f02c90 Merge branch 'holger/merge-on-waves-msc' 2009-10-06 12:54:07 +02:00
Holger Hans Peter Freyther f00c739c02 Merge branch 'holger/merge-msc-bsc-split' 2009-09-30 06:29:28 +02:00
Holger Hans Peter Freyther f3e6b01130 Merge branch 'holger/merge-on-waves-msc' 2009-09-28 12:57:27 +02:00
Harald Welte e9e2168d41 Merge branch 'master' into encryption 2009-09-27 11:13:55 +02:00
Holger Hans Peter Freyther 56c9b9c11c Merge branch 'holger/merge-msc-bsc-split' 2009-08-20 14:02:31 +02:00
Harald Welte edd4564030 Merge commit 'origin/master' 2009-08-20 02:59:50 +09:00
Holger Hans Peter Freyther 70406041d4 Merge branch 'holger/merge-msc-bsc-split' 2009-08-17 09:57:11 +02:00
Harald Welte 407c85824d Merge commit 'har/master' 2009-08-17 09:41:48 +02:00
Harald Welte 5af78bf577 Merge commit 'har/master' 2009-08-15 03:21:45 +02:00
Harald Welte (local) 5c26254807 Merge commit 'har/stefan' 2009-08-14 21:38:41 +02:00
Stefan Schmidt 66d620da00 Merge branch 'master' of git@192.168.100.10:openbsc 2009-08-13 21:34:02 +02:00
Stefan Schmidt 59a1bab205 Merge branch 'master' of git@192.168.100.10:openbsc 2009-08-13 21:01:25 +02:00
Daniel Willmann 57d70e5e7e Merge commit 'har/laforge' 2009-08-13 20:30:46 +02:00
Harald Welte 38c735db1c Merge commit 'origin/master' 2009-08-10 14:45:08 +02:00
Harald Welte 9fed494bd6 Merge commit 'origin/master' 2009-08-10 11:43:52 +02:00
Harald Welte 94b29cd3b1 Merge commit 'origin/master' 2009-08-10 11:28:33 +02:00
Harald Welte 863be2f295 Merge branch 'master' into config_file 
Conflicts:
	openbsc/src/vty_interface.c
 2009-08-09 19:55:21 +02:00
Harald Welte fccd9e3d6f Merge commit 'origin/master' 
Conflicts:
	openbsc/src/vty_interface.c
 2009-08-09 19:53:12 +02:00
Harald Welte 100f10780e Merge branch 'master' into config_file 
Conflicts:
	openbsc/src/vty_interface.c
 2009-08-08 16:08:54 +02:00
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