summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Create new 'gprs-sgsn' branch on top of 'gprs-conf'Harald Welte2010-05-044-0/+944
| | | | | This branch contains the partial SGSN/GGSN implementation that was originally developed as part of the gprs branch.
* Merge commit '35a939463eee58492c88cbe7531288237cdcf454'Harald Welte2010-05-010-0/+0
|\
* | Merge commit 'debf95507461965aa82be2fa2bf34119343cfb0e'Harald Welte2010-05-010-0/+0
|\|
* | Merge commit '074c9f904cb5e4f6ab014d76e4abc079c16fc5d7'Harald Welte2010-04-300-0/+0
|\|
* | Merge branch 'on-waves/sccp'Holger Hans Peter Freyther2010-04-250-0/+0
|\ \
* \ \ Merge branch 'on-waves/mgcp'Holger Hans Peter Freyther2010-04-250-0/+0
|\ \ \
* | | | Merge branch 'on-waves/mgcp'Holger Hans Peter Freyther2010-04-170-0/+0
|\| | |
| * | | Merge branch 'master' into on-waves/mgcpHolger Hans Peter Freyther2010-04-070-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'on-waves/sccp'Holger Hans Peter Freyther2010-04-070-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'Harald Welte2010-03-260-0/+0
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'on-waves/mgcp'Holger Hans Peter Freyther2010-04-070-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote branch 'origin/master' into on-waves/mgcpHolger Hans Peter Freyther2010-03-300-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge commit '3ae2758fba1dc9b364238c6e1e7d591b12c3d878'Harald Welte2010-03-260-0/+0
|\ \ \ \ | | |_|/ | |/| |
* | | | Merge branch 'holger/bsc-msc-separation'Holger Hans Peter Freyther2010-03-250-0/+0
| | | |
* | | | Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'Harald Welte2010-03-250-0/+0
|\| | | | |_|/ |/| |
* | | Merge commit '4cd3d8a2c7982ba11d05d2500b1bfca44f440d1e'Harald Welte2010-03-230-0/+0
|\| |
* | | Add 'libosmocore/' from commit '045cc22baeb7f12dcb0022b79a1984d86e922870'Harald Welte2010-03-220-0/+0
|\| | | | | | | | | | | | | | | | | git-subtree-dir: libosmocore git-subtree-mainline: e164d29e7f6c86d1f6f047bbf58159e46a11425f git-subtree-split: 045cc22baeb7f12dcb0022b79a1984d86e922870
| * | Merge remote branch 'origin/master'Harald Welte2010-02-240-0/+0
| | |
| * | intial checkin of the libosmocore projectHarald Welte2010-02-200-0/+0
| /
* | Merge remote branch 'origin/on-waves/sccp'Holger Hans Peter Freyther2010-02-260-0/+0
|\ \
| * \ Merge remote branch 'origin/master' into on-waves/sccpHolger Hans Peter Freyther2010-02-260-0/+0
| |\ \
* | \ \ Merge remote branch 'origin/on-waves/mgcp'Holger Hans Peter Freyther2010-02-260-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge remote branch 'origin/master' into on-waves/mgcpHolger Hans Peter Freyther2010-02-260-0/+0
| |\ \ | |/ / |/| | | | | | | | | | | Conflicts: openbsc/include/openbsc/Makefile.am openbsc/src/Makefile.am
* | | Merge branch 'on-waves/sccp'Holger Hans Peter Freyther2010-02-200-0/+0
|\ \ \ | | |/ | |/|
* | | Merge branch 'on-waves/sccp'Holger Hans Peter Freyther2010-02-140-0/+0
|\| |
* | | Merge branch 'on-waves/sccp'Holger Hans Peter Freyther2010-02-120-0/+0
|\| |
| * | Merge branch 'master' into on-waves/sccpHolger Hans Peter Freyther2010-02-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge branch 'on-waves/mgcp'Holger Hans Peter Freyther2010-02-030-0/+0
| |/ |/|
* | Merge remote branch 'goeller/master'Harald Welte2010-01-120-0/+0
|\ \
| * | Merge branch 'on-waves/mgcp'Holger Hans Peter Freyther2010-01-110-0/+0
|/ /
* | Merge remote branch 'origin/master'Harald Welte2009-12-240-0/+0
| |
* | Merge remote branch 'origin/master'Harald Welte2009-12-120-0/+0
| |
* | Merge branch 'on-waves/mgcp'Holger Hans Peter Freyther2009-11-200-0/+0
| |
* | Merge branch 'on-waves/sccp'Holger Hans Peter Freyther2009-11-200-0/+0
|/
* Merge remote branch 'origin/master'Harald Welte2009-11-180-0/+0
|
* Merge remote branch 'origin/master'Harald Welte2009-10-300-0/+0
|\
| * Merge branch 'holger/merge-on-waves-msc'Holger Hans Peter Freyther2009-10-300-0/+0
|/
* Merge branch 'holger/merge-on-waves-msc'Holger Hans Peter Freyther2009-10-270-0/+0
|
* Merge remote branch 'origin/master'Harald Welte2009-10-260-0/+0
|\
| * Merge remote branch 'origin/master'Harald Welte2009-10-210-0/+0
|/|
| * Merge branch 'holger/merge-on-waves-msc'Holger Hans Peter Freyther2009-10-210-0/+0
|/
* Merge branch 'holger/merge-on-waves-msc'Holger Hans Peter Freyther2009-10-060-0/+0
|
* Merge branch 'holger/merge-msc-bsc-split'Holger Hans Peter Freyther2009-09-300-0/+0
|
* Merge branch 'holger/merge-on-waves-msc'Holger Hans Peter Freyther2009-09-280-0/+0
|
* Merge branch 'master' into encryptionHarald Welte2009-09-270-0/+0
|
* Merge branch 'holger/merge-msc-bsc-split'Holger Hans Peter Freyther2009-08-200-0/+0
|
* Merge commit 'origin/master'Harald Welte2009-08-200-0/+0
|
* Merge branch 'holger/merge-msc-bsc-split'Holger Hans Peter Freyther2009-08-170-0/+0
|\
| * Merge commit 'har/master'Harald Welte2009-08-170-0/+0
|/
* Merge commit 'har/master'Harald Welte2009-08-150-0/+0
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 15:46:55 +0000