Commit Graph

91 Commits

Author SHA1 Message Date
Harald Welte 9ba500559a Create new 'gprs-sgsn' branch on top of 'gprs-conf'
This branch contains the partial SGSN/GGSN implementation that
was originally developed as part of the gprs branch.
2010-05-04 07:20:41 +02:00
Harald Welte 20488d4881 Merge commit '35a939463eee58492c88cbe7531288237cdcf454' 2010-05-01 14:27:23 +02:00
Harald Welte 3c73dda6ca Merge commit 'debf95507461965aa82be2fa2bf34119343cfb0e' 2010-05-01 12:07:56 +02:00
Harald Welte 871774ee89 Merge commit '074c9f904cb5e4f6ab014d76e4abc079c16fc5d7' 2010-04-30 14:29:56 +02:00
Holger Hans Peter Freyther c646345647 Merge branch 'on-waves/sccp' 2010-04-25 23:07:24 +08:00
Holger Hans Peter Freyther f3e25ed7ae Merge branch 'on-waves/mgcp' 2010-04-25 23:03:30 +08:00
Holger Hans Peter Freyther 17c3712dae Merge branch 'on-waves/mgcp' 2010-04-17 06:46:06 +02:00
Holger Hans Peter Freyther 428f2301eb Merge branch 'master' into on-waves/mgcp 2010-04-07 23:03:27 +02:00
Holger Hans Peter Freyther e1d67ecc43 Merge branch 'on-waves/sccp' 2010-04-07 22:54:12 +02:00
Holger Hans Peter Freyther 8975522b84 Merge branch 'on-waves/mgcp' 2010-04-07 22:54:07 +02:00
Holger Hans Peter Freyther ca2c31c765 Merge remote branch 'origin/master' into on-waves/mgcp 2010-03-30 15:35:26 +02:00
Harald Welte 9a3b6b8a2f Merge commit '3ae2758fba1dc9b364238c6e1e7d591b12c3d878' 2010-03-26 21:35:28 +08:00
Harald Welte 21d3e7aaa2 Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab' 2010-03-26 05:15:27 +01:00
Holger Hans Peter Freyther a985bdbc2e Merge branch 'holger/bsc-msc-separation' 2010-03-25 09:08:53 +01:00
Harald Welte c578069493 Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab' 2010-03-25 12:15:24 +08:00
Harald Welte fdcf65b91c Merge commit '4cd3d8a2c7982ba11d05d2500b1bfca44f440d1e' 2010-03-23 00:37:52 +08:00
Harald Welte e69210857f Add 'libosmocore/' from commit '045cc22baeb7f12dcb0022b79a1984d86e922870'
git-subtree-dir: libosmocore
git-subtree-mainline: e164d29e7f6c86d1f6f047bbf58159e46a11425f
git-subtree-split: 045cc22bae
2010-03-22 22:25:13 +08:00
Holger Hans Peter Freyther edc37630da Merge remote branch 'origin/on-waves/sccp' 2010-02-26 20:21:21 +01:00
Holger Hans Peter Freyther a358b48311 Merge remote branch 'origin/on-waves/mgcp' 2010-02-26 20:20:17 +01:00
Holger Hans Peter Freyther 8716bb6ebd Merge remote branch 'origin/master' into on-waves/sccp 2010-02-26 20:18:24 +01:00
Holger Hans Peter Freyther 3af86269a9 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
Harald Welte 2b6322cde1 Merge remote branch 'origin/master' 2010-02-24 22:52:58 +01:00
Harald Welte f704c3e633 intial checkin of the libosmocore project 2010-02-20 20:34:29 +01:00
Holger Hans Peter Freyther ffecf66fc1 Merge branch 'on-waves/sccp' 2010-02-20 00:38:20 +01:00
Holger Hans Peter Freyther 771d47f8ad Merge branch 'on-waves/sccp' 2010-02-14 19:27:52 +01:00
Holger Hans Peter Freyther 5a678ed5b5 Merge branch 'on-waves/sccp' 2010-02-12 22:52:12 +01:00
Holger Hans Peter Freyther c2fd90985c Merge branch 'master' into on-waves/sccp 2010-02-03 18:15:05 +01:00
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